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

diff --git a/mod/regmod.php b/mod/regmod.php
index 21f41eb01c..aa64986d06 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,7 +1,20 @@
 <?php
-
-function user_allow($hash) {
-
+/**
+ * @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\Model\User;
+use Friendica\Module\Login;
+
+require_once 'include/enotify.php';
+
+function user_allow($hash)
+{
 	$a = get_app();
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
@@ -9,127 +22,109 @@ 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(Config::get('system', 'directory'))) {
+			Worker::add(PRIORITY_LOW, "Directory", $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']
-	));
+	L10n::pushLang($register[0]['language']);
 
-	$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' );
+	$res = User::sendRegisterOpenEmail(
+		$user[0]['email'],
+		$a->config['sitename'],
+		System::baseUrl(),
+		$user[0]['username'],
+		$register[0]['password']);
 
-	pop_lang();
+	L10n::popLang();
 
-	if($res) {
-		info( t('Account approved.') . EOL );
+	if ($res) {
+		info(L10n::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
-
-function user_deny($hash) {
-
+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 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', ['uid' => $register[0]['uid']]);
+	dba::delete('register', ['hash' => $register[0]['hash']]);
+
+	notice(L10n::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()) {
-		info( t('Please login.') . EOL);
-		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+	if (!local_user()) {
+		info(L10n::t('Please login.') . EOL);
+		$o = '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
 		return $o;
 	}
 
-	if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
-		notice( t('Permission denied.') . EOL);
+	if ((!is_site_admin()) || (x($_SESSION, 'submanage') && intval($_SESSION['submanage']))) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return '';
 	}
 
-	if($a->argc != 3)
+	if ($a->argc != 3) {
 		killme();
+	}
 
-	$cmd  = $a->argv[1];
+	$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();
 	}
 }