X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=df1020b9f4df7652f659d963e7546cb9400163bb;hb=79803a6546dd251f6fee557434816a39bc1fb7ce;hp=295d8df25f5a02066c41d74376f8bdd0941f7bb4;hpb=f8c0f24e34e124ab782d5dcf3d2d658d70e19e5c;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index 295d8df25f..df1020b9f4 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,22 +1,34 @@
 <?php
 /**
- * @file mod/regmod.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/>.
+ *
  */
 
 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;
+use Friendica\Module\Security\Login;
 
 function user_allow($hash)
 {
-	$a = \get_app();
-
 	$register = Register::getByHash($hash);
 	if (!DBA::isResult($register)) {
 		return false;
@@ -31,26 +43,25 @@ function user_allow($hash)
 
 	DBA::update('user', ['blocked' => false, 'verified' => true], ['uid' => $register['uid']]);
 
-	$profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid'], 'is-default' => true]);
+	$profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid']]);
 
-	if (DBA::isResult($profile) && $profile['net-publish'] && Config::get('system', 'directory')) {
-		$url = System::baseUrl() . '/profile/' . $user['nickname'];
+	if (DBA::isResult($profile) && $profile['net-publish'] && DI::config()->get('system', 'directory')) {
+		$url = DI::baseUrl() . '/profile/' . $user['nickname'];
 		Worker::add(PRIORITY_LOW, "Directory", $url);
 	}
 
-	L10n::pushLang($register['language']);
+	$l10n = DI::l10n()->withLang($register['language']);
 
 	$res = User::sendRegisterOpenEmail(
+		$l10n,
 		$user,
-		Config::get('config', 'sitename'),
-		$a->getBaseUrl(),
+		DI::config()->get('config', 'sitename'),
+		DI::baseUrl()->get(),
 		($register['password'] ?? '') ?: 'Sent in a previous email'
 	);
 
-	L10n::popLang();
-
 	if ($res) {
-		info(L10n::t('Account approved.') . EOL);
+		info(DI::l10n()->t('Account approved.') . EOL);
 		return true;
 	}
 }
@@ -74,19 +85,19 @@ function user_deny($hash)
 
 	Register::deleteByHash($register['hash']);
 
-	notice(L10n::t('Registration revoked for %s', $user['username']) . EOL);
+	notice(DI::l10n()->t('Registration revoked for %s', $user['username']) . EOL);
 	return true;
 }
 
 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')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
+		info(DI::l10n()->t('Please login.') . EOL);
+		return Login::form(DI::args()->getQueryString(), intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
 	}
 
 	if (!is_site_admin() || !empty($_SESSION['submanage'])) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.') . EOL);
 		return '';
 	}
 
@@ -99,11 +110,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/');
 	}
 }