X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=a2c454f9a2c295b756d6fdc2423000bd778b26c9;hb=ab60641e3ba731aca42ab510bdf9c2411db6aab4;hp=21f41eb01ccc3c854443f22e3465ba50cc3797fa;hpb=c3139fa0fd49b0b4de4568d46a6946c75ccb2a62;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index 21f41eb01c..a2c454f9a2 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,5 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+
+require_once('include/enotify.php');
+require_once('include/user.php');
+
 function user_allow($hash) {
 
 	$a = get_app();
@@ -9,58 +15,52 @@ 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' LIMIT 1",
+	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
 		dbesc($register[0]['hash'])
 	);
 
 
-	$r = q("UPDATE `user` SET `blocked` = 0, `verified` = 1 WHERE `uid` = %d LIMIT 1",
+	$r = q("UPDATE `user` SET `blocked` = 0, `verified` = 1 WHERE `uid` = %d",
 		intval($register[0]['uid'])
 	);
-	
+
 	$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_submit_url')))
-			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(get_config('system','directory'))) {
+			proc_run(PRIORITY_LOW, "include/directory.php", $url);
+		}
 	}
 
 	push_lang($register[0]['language']);
 
-	$email_tpl = get_intltext_template("register_open_eml.tpl");
-	$email_tpl = replace_macros($email_tpl, array(
-			'$sitename' => $a->config['sitename'],
-			'$siteurl' =>  $a->get_baseurl(),
-			'$username' => $user[0]['username'],
-			'$email' => $user[0]['email'],
-			'$password' => $register[0]['password'],
-			'$uid' => $user[0]['uid']
-	));
-
-	$res = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
-		$email_tpl,
-			'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
-			. 'Content-type: text/plain; charset=UTF-8' . "\n"
-			. 'Content-transfer-encoding: 8bit' );
+	send_register_open_eml(
+		$user[0]['email'],
+		$a->config['sitename'],
+		System::baseUrl(),
+		$user[0]['username'],
+		$register[0]['password']);
 
 	pop_lang();
 
 	if($res) {
 		info( t('Account approved.') . EOL );
 		return true;
-	}	
+	}
 
 }
 
@@ -75,61 +75,57 @@ function user_deny($hash) {
 		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 LIMIT 1",
-		intval($register[0]['uid'])
-	);
-	$r = q("DELETE FROM `contact` WHERE `uid` = %d LIMIT 1",
-		intval($register[0]['uid'])
-	); 
-	$r = q("DELETE FROM `profile` WHERE `uid` = %d LIMIT 1",
-		intval($register[0]['uid'])
-	); 
 
-	$r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
-		dbesc($register[0]['hash'])
-	);
-	notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+	dba::delete('user', array('uid' => $register[0]['uid']));
+	dba::delete('register', array('hash' => $register[0]['hash']));
+
+	notice(sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
 	return true;
-	
+
 }
 
-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 (!user_deny($hash)) killme();
+	if ($cmd === 'deny') {
+		user_deny($hash);
+		goaway(System::baseUrl()."/admin/users/");
+		killme();
 	}
 
-	if($cmd === 'allow') {
-		if (!user_allow($hash)) killme();
+	if ($cmd === 'allow') {
+		user_allow($hash);
+		goaway(System::baseUrl()."/admin/users/");
+		killme();
 	}
 }