mirror of
https://github.com/friendica/friendica
synced 2025-04-23 20:30:10 +00:00
Some more deprecated function calls are replaced
This commit is contained in:
parent
bd6616e84f
commit
e12f92e516
30 changed files with 101 additions and 163 deletions
|
@ -68,7 +68,7 @@ class Invite extends BaseModule
|
|||
if ($config->get('system', 'invitation_only')) {
|
||||
$invitation_only = true;
|
||||
$invites_remaining = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'invites_remaining');
|
||||
if ((!$invites_remaining) && (!$app->isSiteAdmin())) {
|
||||
if ((!$invites_remaining) && (!DI::userSession()->isSiteAdmin())) {
|
||||
throw new HTTPException\ForbiddenException();
|
||||
}
|
||||
}
|
||||
|
@ -83,11 +83,11 @@ class Invite extends BaseModule
|
|||
continue;
|
||||
}
|
||||
|
||||
if ($invitation_only && ($invites_remaining || $app->isSiteAdmin())) {
|
||||
if ($invitation_only && ($invites_remaining || DI::userSession()->isSiteAdmin())) {
|
||||
$code = Model\Register::createForInvitation();
|
||||
$nmessage = str_replace('$invite_code', $code, $message);
|
||||
|
||||
if (!$app->isSiteAdmin()) {
|
||||
if (!DI::userSession()->isSiteAdmin()) {
|
||||
$invites_remaining--;
|
||||
if ($invites_remaining >= 0) {
|
||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'invites_remaining', $invites_remaining);
|
||||
|
@ -139,7 +139,7 @@ class Invite extends BaseModule
|
|||
if ($config->get('system', 'invitation_only')) {
|
||||
$inviteOnly = true;
|
||||
$x = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'invites_remaining');
|
||||
if ((!$x) && (!$app->isSiteAdmin())) {
|
||||
if ((!$x) && (!DI::userSession()->isSiteAdmin())) {
|
||||
throw new HTTPException\ForbiddenException(DI::l10n()->t('You have no more invitations available'));
|
||||
}
|
||||
}
|
||||
|
@ -172,7 +172,7 @@ class Invite extends BaseModule
|
|||
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) ? 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() . '/profile/' . $app->getLoggedInUserNickname()
|
||||
. "\r\n" . "\r\n" . DI::baseUrl() . '/profile/' . DI::userSession()->getLocalUserNickname()
|
||||
. "\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' => DI::l10n()->t('Submit')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue