use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
+use Friendica\Database\DBA;
use Friendica\Protocol\Email;
-use Friendica\Util\Temporal;
+use Friendica\Util\DateTimeFormat;
function invite_post(App $a)
{
}
- $recips = ((x($_POST, 'recipients')) ? explode("\n", $_POST['recipients']) : []);
- $message = ((x($_POST, 'message')) ? notags(trim($_POST['message'])) : '');
+ $recipients = !empty($_POST['recipients']) ? explode("\n", $_POST['recipients']) : [];
+ $message = !empty($_POST['message']) ? notags(trim($_POST['message'])) : '';
$total = 0;
if (Config::get('system', 'invitation_only')) {
- $invonly = true;
- $x = PConfig::get(local_user(), 'system', 'invites_remaining');
- if ((! $x) && (! is_site_admin())) {
+ $invitation_only = true;
+ $invites_remaining = PConfig::get(local_user(), 'system', 'invites_remaining');
+ if ((! $invites_remaining) && (! is_site_admin())) {
return;
}
}
- foreach ($recips as $recip) {
- $recip = trim($recip);
+ foreach ($recipients as $recipient) {
+ $recipient = trim($recipient);
- if (! valid_email($recip)) {
- notice(L10n::t('%s : Not a valid email address.', $recip) . EOL);
+ if (! valid_email($recipient)) {
+ notice(L10n::t('%s : Not a valid email address.', $recipient) . EOL);
continue;
}
- if ($invonly && ($x || is_site_admin())) {
+ if ($invitation_only && ($invites_remaining || is_site_admin())) {
$code = autoname(8) . srand(1000, 9999);
$nmessage = str_replace('$invite_code', $code, $message);
$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
- dbesc($code),
- dbesc(Temporal::convert())
+ DBA::escape($code),
+ DBA::escape(DateTimeFormat::utcNow())
);
if (! is_site_admin()) {
- $x --;
- if ($x >= 0) {
- PConfig::set(local_user(), 'system', 'invites_remaining', $x);
+ $invites_remaining --;
+ if ($invites_remaining >= 0) {
+ PConfig::set(local_user(), 'system', 'invites_remaining', $invites_remaining);
} else {
return;
}
$nmessage = $message;
}
- $res = mail($recip, Email::encodeHeader(L10n::t('Please join us on Friendica'), 'UTF-8'),
- $nmessage,
- "From: " . $a->user['email'] . "\n"
+ $additional_headers = 'From: ' . $a->user['email'] . "\n"
+ . 'Sender: ' . $a->getSenderEmailAddress() . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
+ . 'Content-transfer-encoding: 8bit';
+
+ $res = mail(
+ $recipient,
+ Email::encodeHeader(L10n::t('Please join us on Friendica'), 'UTF-8'),
+ $nmessage,
+ $additional_headers);
if ($res) {
$total ++;
return;
}
} else {
- notice(L10n::t('%s : Message delivery failed.', $recip) . EOL);
+ notice(L10n::t('%s : Message delivery failed.', $recipient) . EOL);
}
}
$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 {
$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')
]);
projects / friendica.git / blobdiff