X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=6d76e7ea7eb7f8814d892283ace04fa144782aac;hb=09667dd82bbb9bb23a4ad8d86c1e9f3146665aa5;hp=2e3ca414e3408277425cea9477a2a9000e10b1fd;hpb=db949bb802448184bfe5164d8d3dd86ddf51b187;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index 2e3ca414e3..6d76e7ea7e 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,9 +1,14 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+
 require_once('include/enotify.php');
 require_once('include/user.php');
 
-if(! function_exists('user_allow')) {
 function user_allow($hash) {
 
 	$a = get_app();
@@ -13,15 +18,17 @@ function user_allow($hash) {
 	);
 
 
-	if(! count($register))
+	if (! DBM::is_result($register)) {
 		return false;
+	}
 
 	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($register[0]['uid'])
 	);
 
-	if(! count($user))
+	if (! DBM::is_result($user)) {
 		killme();
+	}
 
 	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
 		dbesc($register[0]['hash'])
@@ -35,10 +42,11 @@ function user_allow($hash) {
 	$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
 		intval($user[0]['uid'])
 	);
-	if(count($r) && $r[0]['net-publish']) {
-		$url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
-		if($url && strlen(get_config('system','directory')))
-			proc_run('php',"include/directory.php","$url");
+	if (DBM::is_result($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);
+		}
 	}
 
 	push_lang($register[0]['language']);
@@ -46,7 +54,7 @@ function user_allow($hash) {
 	send_register_open_eml(
 		$user[0]['email'],
 		$a->config['sitename'],
-		$a->get_baseurl(),
+		System::baseUrl(),
 		$user[0]['username'],
 		$register[0]['password']);
 
@@ -56,81 +64,71 @@ function user_allow($hash) {
 		info( t('Account approved.') . EOL );
 		return true;
 	}
-}
+
 }
 
 
 // This does not have to go through user_remove() and save the nickname
 // permanently against re-registration, as the person was not yet
 // allowed to have friends on this system
-if(! function_exists('user_deny')) {
+
 function user_deny($hash) {
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
 		dbesc($hash)
 	);
 
-	if(! count($register))
+	if (!DBM::is_result($register)) {
 		return false;
+	}
 
 	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($register[0]['uid'])
 	);
 
-	$r = q("DELETE FROM `user` WHERE `uid` = %d",
-		intval($register[0]['uid'])
-	);
-	$r = q("DELETE FROM `contact` WHERE `uid` = %d",
-		intval($register[0]['uid'])
-	);
-	$r = q("DELETE FROM `profile` WHERE `uid` = %d",
-		intval($register[0]['uid'])
-	);
+	dba::delete('user', array('uid' => $register[0]['uid']));
+	dba::delete('register', array('hash' => $register[0]['hash']));
 
-	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
-		dbesc($register[0]['hash'])
-	);
-	notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+	notice(sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
 	return true;
-}
+
 }
 
-if(! function_exists('regmod_content')) {
-function regmod_content(&$a) {
+function regmod_content(App $a) {
 
 	global $lang;
 
 	$_SESSION['return_url'] = $a->cmd;
 
-	if(! local_user()) {
+	if (! local_user()) {
 		info( t('Please login.') . EOL);
 		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 		return $o;
 	}
 
-	if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
+	if ((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
 		notice( t('Permission denied.') . EOL);
 		return '';
 	}
 
-	if($a->argc != 3)
+	if ($a->argc != 3) {
 		killme();
+	}
 
 	$cmd  = $a->argv[1];
 	$hash = $a->argv[2];
 
 
 
-	if($cmd === 'deny') {
+	if ($cmd === 'deny') {
 		user_deny($hash);
-		goaway($a->get_baseurl()."/admin/users/");
+		goaway(System::baseUrl()."/admin/users/");
 		killme();
 	}
 
-	if($cmd === 'allow') {
+	if ($cmd === 'allow') {
 		user_allow($hash);
-		goaway($a->get_baseurl()."/admin/users/");
+		goaway(System::baseUrl()."/admin/users/");
 		killme();
 	}
 }
-}