New user account type "Channel Relay"

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

diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 3230dfa3540d71ad02eece29afbb2d153580ec9f..f300f96435e76a0949d8609218e78a8c6fd2a7b5 100644 (file)
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -78,7 +78,7 @@ class Invite extends BaseModule
                foreach ($recipients as $recipient) {
                        $recipient = trim($recipient);
 
-                       if (!filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
+                       if (DI::config()->get('system', 'only_valid_email_addresses', true) && !filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
                                DI::sysmsg()->addNotice(DI::l10n()->t('%s : Not a valid email address.', $recipient));
                                continue;
                        }
@@ -149,14 +149,14 @@ class Invite extends BaseModule
                        if ($config->get('config', 'register_policy') === Register::CLOSED) {
                                $linkTxt = DI::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 = DI::l10n()->t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl())
+                               $linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl() . '/register')
                                        . "\r\n" . "\r\n" . DI::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 DI::l10n()->t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
                        } else {
-                               $linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s.', DI::baseUrl()
+                               $linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s.', DI::baseUrl() . '/register' 
                                        . "\r\n" . "\r\n" . DI::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.'));
                        }
                }