X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=49845e873191405bfef373066760ede30061d843;hb=86320317f493d0bf26fac7860d2e0c388633ab0c;hp=a7aebf6b0a4ebfd9bf8580653842b21e637f63cc;hpb=c0abff0bda84b9151fb3314c6b33a262d0b44d13;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index a7aebf6b0a..49845e8731 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -6,19 +6,15 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Register;
 use Friendica\Model\User;
-use Friendica\Module\Login;
-
-require_once 'include/enotify.php';
+use Friendica\Module\Security\Login;
 
 function user_allow($hash)
 {
-	$a = get_app();
-
 	$register = Register::getByHash($hash);
 	if (!DBA::isResult($register)) {
 		return false;
@@ -36,21 +32,20 @@ function user_allow($hash)
 	$profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid'], 'is-default' => true]);
 
 	if (DBA::isResult($profile) && $profile['net-publish'] && Config::get('system', 'directory')) {
-		$url = System::baseUrl() . '/profile/' . $user['nickname'];
+		$url = DI::baseUrl() . '/profile/' . $user['nickname'];
 		Worker::add(PRIORITY_LOW, "Directory", $url);
 	}
 
-	L10n::pushLang($register['language']);
+	$l10n = L10n::withLang($register['language']);
 
 	$res = User::sendRegisterOpenEmail(
+		$l10n,
 		$user,
 		Config::get('config', 'sitename'),
-		$a->getBaseUrl(),
-		defaults($register, 'password', 'Sent in a previous email')
+		DI::baseUrl()->get(),
+		($register['password'] ?? '') ?: 'Sent in a previous email'
 	);
 
-	L10n::popLang();
-
 	if ($res) {
 		info(L10n::t('Account approved.') . EOL);
 		return true;
@@ -84,7 +79,7 @@ function regmod_content(App $a)
 {
 	if (!local_user()) {
 		info(L10n::t('Please login.') . EOL);
-		return Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
+		return Login::form(DI::args()->getQueryString(), intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
 	}
 
 	if (!is_site_admin() || !empty($_SESSION['submanage'])) {
@@ -101,11 +96,11 @@ function regmod_content(App $a)
 
 	if ($cmd === 'deny') {
 		user_deny($hash);
-		$a->internalRedirect('admin/users/');
+		DI::baseUrl()->redirect('admin/users/');
 	}
 
 	if ($cmd === 'allow') {
 		user_allow($hash);
-		$a->internalRedirect('admin/users/');
+		DI::baseUrl()->redirect('admin/users/');
 	}
 }