X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FInvite.php;h=287478954ce65c4c5b52813b29fbdf2368f74cd3;hb=0031b4e18cff5ded33c5f8599d6d93ea090986ff;hp=b06efc5a2aaa35f3e0cd635e47eddd038afbb757;hpb=58f69481e61a091f919a8c9cc7d6662e876e765f;p=friendica.git

diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index b06efc5a2a..287478954c 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -1,9 +1,27 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model;
@@ -19,7 +37,7 @@ class Invite extends BaseModule
 	public static function post(array $parameters = [])
 	{
 		if (!local_user()) {
-			throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
+			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 
 		self::checkFormSecurityTokenRedirectOnError('/', 'send_invite');
@@ -34,7 +52,7 @@ class Invite extends BaseModule
 
 		$current_invites = intval(DI::pConfig()->get(local_user(), 'system', 'sent_invites'));
 		if ($current_invites > $max_invites) {
-			throw new HTTPException\ForbiddenException(L10n::t('Total invitation limit exceeded.'));
+			throw new HTTPException\ForbiddenException(DI::l10n()->t('Total invitation limit exceeded.'));
 		}
 
 
@@ -57,7 +75,7 @@ class Invite extends BaseModule
 			$recipient = trim($recipient);
 
 			if (!filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
-				notice(L10n::t('%s : Not a valid email address.', $recipient) . EOL);
+				notice(DI::l10n()->t('%s : Not a valid email address.', $recipient));
 				continue;
 			}
 
@@ -78,13 +96,13 @@ class Invite extends BaseModule
 			}
 
 			$additional_headers = 'From: ' . $app->user['email'] . "\n"
-				. 'Sender: ' . $app->getSenderEmailAddress() . "\n"
+				. 'Sender: ' . DI::emailer()->getSiteEmailAddress() . "\n"
 				. 'Content-type: text/plain; charset=UTF-8' . "\n"
 				. 'Content-transfer-encoding: 8bit';
 
 			$res = mail(
 				$recipient,
-				Email::encodeHeader(L10n::t('Please join us on Friendica'), 'UTF-8'),
+				Email::encodeHeader(DI::l10n()->t('Please join us on Friendica'), 'UTF-8'),
 				$nmessage,
 				$additional_headers);
 
@@ -93,21 +111,21 @@ class Invite extends BaseModule
 				$current_invites++;
 				DI::pConfig()->set(local_user(), 'system', 'sent_invites', $current_invites);
 				if ($current_invites > $max_invites) {
-					notice(L10n::t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
+					notice(DI::l10n()->t('Invitation limit exceeded. Please contact your site administrator.'));
 					return;
 				}
 			} else {
-				notice(L10n::t('%s : Message delivery failed.', $recipient) . EOL);
+				notice(DI::l10n()->t('%s : Message delivery failed.', $recipient));
 			}
 
 		}
-		notice(L10n::tt('%d message sent.', '%d messages sent.', $total) . EOL);
+		info(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total));
 	}
 
 	public static function content(array $parameters = [])
 	{
 		if (!local_user()) {
-			throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
+			throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
 		}
 
 		$app = DI::app();
@@ -119,42 +137,42 @@ class Invite extends BaseModule
 			$inviteOnly = true;
 			$x = DI::pConfig()->get(local_user(), 'system', 'invites_remaining');
 			if ((!$x) && (!is_site_admin())) {
-				throw new HTTPException\ForbiddenException(L10n::t('You have no more invitations available'));
+				throw new HTTPException\ForbiddenException(DI::l10n()->t('You have no more invitations available'));
 			}
 		}
 
 		$dirLocation = $config->get('system', 'directory');
 		if (strlen($dirLocation)) {
 			if ($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.', $dirLocation . '/servers');
+				$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 = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl()->get())
-					. "\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.', $dirLocation . '/servers');
+				$linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s or any other public Friendica website.', DI::baseUrl()->get())
+					. "\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 L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
+				return DI::l10n()->t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
 			} else {
-				$linkTxt = L10n::t('To accept this invitation, please visit and register at %s.', DI::baseUrl()->get()
-					. "\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.'));
+				$linkTxt = DI::l10n()->t('To accept this invitation, please visit and register at %s.', DI::baseUrl()->get()
+					. "\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.'));
 			}
 		}
 
 		$tpl = Renderer::getMarkupTemplate('invite.tpl');
 		return Renderer::replaceMacros($tpl, [
 			'$form_security_token' => self::getFormSecurityToken('send_invite'),
-			'$title'               => L10n::t('Send invitations'),
-			'$recipients'          => ['recipients', L10n::t('Enter email addresses, one per line:')],
+			'$title'               => DI::l10n()->t('Send invitations'),
+			'$recipients'          => ['recipients', DI::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"
+				DI::l10n()->t('Your message:'),
+				DI::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" . (($inviteOnly) ? 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" . (($inviteOnly) ? DI::l10n()->t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') . DI::l10n()->t('Once you have registered, please connect with me via my profile page at:')
 				. "\r\n" . "\r\n" . DI::baseUrl()->get() . '/profile/' . $app->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" . DI::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')
+			'$submit'              => DI::l10n()->t('Submit')
 		]);
 	}
 }