X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=5a90db1f902d0b0265d26c1da3104bb1b5ce3e70;hb=5b5b94232527a3ab4226378b3667907f06b42a35;hp=b985ee3644e69600d960a98cfe8f73be19109c88;hpb=de131c9e58ac2b14380d145d643bf2bd902ae9dc;p=friendica.git

diff --git a/mod/regmod.php b/mod/regmod.php
index b985ee3644..5a90db1f90 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,18 +1,112 @@
 <?php
 
+require_once('include/enotify.php');
+require_once('include/user.php');
 
+function user_allow($hash) {
+
+	$a = get_app();
+
+	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
+		dbesc($hash)
+	);
+
+
+	if(! count($register))
+		return false;
+
+	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		intval($register[0]['uid'])
+	);
+
+	if(! count($user))
+		killme();
+
+	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
+		dbesc($register[0]['hash'])
+	);
+
+
+	$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')))
+			proc_run('php',"include/directory.php","$url");
+	}
+
+	push_lang($register[0]['language']);
+
+	send_register_open_eml(
+		$user[0]['email'],
+		$a->config['sitename'],
+		$a->get_baseurl(),
+		$user[0]['username'],
+		$register[0]['password']);
+
+	pop_lang();
+
+	if($res) {
+		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
+
+function user_deny($hash) {
+
+	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
+		dbesc($hash)
+	);
+
+	if(! count($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'])
+	);
+
+	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
+		dbesc($register[0]['hash'])
+	);
+	notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+	return true;
+
+}
 
 function regmod_content(&$a) {
 
+	global $lang;
+
 	$_SESSION['return_url'] = $a->cmd;
 
 	if(! local_user()) {
-		notice( t('Please login.') . EOL);
+		info( t('Please login.') . EOL);
 		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 		return $o;
 	}
 
-	if((! (x($a->config,'admin_email'))) || ($a->config['admin_email'] !== $a->user['email'])) {
+	if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
 		notice( t('Permission denied.') . EOL);
 		return '';
 	}
@@ -24,80 +118,16 @@ function regmod_content(&$a) {
 	$hash = $a->argv[2];
 
 
-	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
-		dbesc($hash)
-	);
-
-
-	if(! count($register))
-		killme();
-
-	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-		intval($register[0]['uid'])
-	);
 
 	if($cmd === 'deny') {
-
-		$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);
-		return;
-
+		user_deny($hash);
+		goaway($a->get_baseurl()."/admin/users/");
+		killme();
 	}
 
 	if($cmd === 'allow') {
-
-		if(! count($user))
-			killme();
-
-		$r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
-			dbesc($register[0]['hash'])
-		);
-
-
-		$r = q("UPDATE `user` SET `blocked` = 0, `verified` = 1 WHERE `uid` = %d LIMIT 1",
-			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");
-		}
-
-		$email_tpl = load_view_file("view/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' );
-
-		if($res) {
-			notice( t('Account approved.') . EOL );
-			return;
-		}
+		user_allow($hash);
+		goaway($a->get_baseurl()."/admin/users/");
+		killme();
 	}
-}
\ No newline at end of file
+}