X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fregmod.php;h=78cba8a2abf82c0cd98c333879c3ec96bc92c114;hb=388b963714895b6aee59648084fe4a66a0964efc;hp=3f6f0e04e3253e6073f686548e16450b3374d225;hpb=da2a17495d94774a92ea8b6f78563304e299addb;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index 3f6f0e04e3..78cba8a2ab 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -11,13 +11,11 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 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();
+	$a = \get_app();
 
 	$register = Register::getByHash($hash);
 	if (!DBA::isResult($register)) {
@@ -40,17 +38,16 @@ function user_allow($hash)
 		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')
+		($register['password'] ?? '') ?: 'Sent in a previous email'
 	);
 
-	L10n::popLang();
-
 	if ($res) {
 		info(L10n::t('Account approved.') . EOL);
 		return true;
@@ -84,7 +81,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($a->query_string, intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
 	}
 
 	if (!is_site_admin() || !empty($_SESSION['submanage'])) {
@@ -101,11 +98,11 @@ function regmod_content(App $a)
 
 	if ($cmd === 'deny') {
 		user_deny($hash);
-		goaway('admin/users/');
+		$a->internalRedirect('admin/users/');
 	}
 
 	if ($cmd === 'allow') {
 		user_allow($hash);
-		goaway('admin/users/');
+		$a->internalRedirect('admin/users/');
 	}
 }