X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=11d8eee412eadd013fb2b0197b825803db8baa2c;hb=f3a97a08286a163962b13e928cb0eb4ce191c520;hp=3542bb4e1fefb2c50d6dfde5aa7dfee9ed636097;hpb=c8ecc3140534b4138db4eea415685f85bc56a5e0;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index 3542bb4e1f..11d8eee412 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -2,12 +2,13 @@
 /**
  * @file mod/regmod.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 
@@ -18,11 +19,11 @@ function user_allow($hash)
 	$a = get_app();
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
-		dbesc($hash)
+		DBA::escape($hash)
 	);
 
 
-	if (!DBM::is_result($register)) {
+	if (!DBA::isResult($register)) {
 		return false;
 	}
 
@@ -30,12 +31,12 @@ function user_allow($hash)
 		intval($register[0]['uid'])
 	);
 
-	if (!DBM::is_result($user)) {
+	if (!DBA::isResult($user)) {
 		killme();
 	}
 
 	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
-		dbesc($register[0]['hash'])
+		DBA::escape($register[0]['hash'])
 	);
 
 
@@ -46,7 +47,7 @@ function user_allow($hash)
 	$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
 		intval($user[0]['uid'])
 	);
-	if (DBM::is_result($r) && $r[0]['net-publish']) {
+	if (DBA::isResult($r) && $r[0]['net-publish']) {
 		$url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
 		if ($url && strlen(Config::get('system', 'directory'))) {
 			Worker::add(PRIORITY_LOW, "Directory", $url);
@@ -55,17 +56,18 @@ function user_allow($hash)
 
 	L10n::pushLang($register[0]['language']);
 
-	User::sendRegisterOpenEmail(
+	$res = User::sendRegisterOpenEmail(
 		$user[0]['email'],
-		$a->config['sitename'],
+		Config::get('config', 'sitename'),
 		System::baseUrl(),
 		$user[0]['username'],
-		$register[0]['password']);
+		$register[0]['password'],
+		$user[0]);
 
 	L10n::popLang();
 
 	if ($res) {
-		info(t('Account approved.') . EOL);
+		info(L10n::t('Account approved.') . EOL);
 		return true;
 	}
 }
@@ -76,10 +78,10 @@ function user_allow($hash)
 function user_deny($hash)
 {
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
-		dbesc($hash)
+		DBA::escape($hash)
 	);
 
-	if (!DBM::is_result($register)) {
+	if (!DBA::isResult($register)) {
 		return false;
 	}
 
@@ -87,25 +89,23 @@ function user_deny($hash)
 		intval($register[0]['uid'])
 	);
 
-	dba::delete('user', ['uid' => $register[0]['uid']]);
-	dba::delete('register', ['hash' => $register[0]['hash']]);
+	DBA::delete('user', ['uid' => $register[0]['uid']]);
+	DBA::delete('register', ['hash' => $register[0]['hash']]);
 
-	notice(sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+	notice(L10n::t('Registration revoked for %s', $user[0]['username']) . EOL);
 	return true;
 }
 
 function regmod_content(App $a)
 {
-	global $lang;
-
 	if (!local_user()) {
-		info(t('Please login.') . EOL);
-		$o .= '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
+		info(L10n::t('Please login.') . EOL);
+		$o = '<br /><br />' . Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
 		return $o;
 	}
 
 	if ((!is_site_admin()) || (x($_SESSION, 'submanage') && intval($_SESSION['submanage']))) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return '';
 	}