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

diff --git a/mod/regmod.php b/mod/regmod.php
index 283b23dfb0..11d8eee412 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -9,7 +9,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 
@@ -20,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;
 	}
 
@@ -32,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'])
 	);
 
 
@@ -48,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);
@@ -62,7 +61,8 @@ function user_allow($hash)
 		Config::get('config', 'sitename'),
 		System::baseUrl(),
 		$user[0]['username'],
-		$register[0]['password']);
+		$register[0]['password'],
+		$user[0]);
 
 	L10n::popLang();
 
@@ -78,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;
 	}