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

diff --git a/mod/regmod.php b/mod/regmod.php
index 2cbe810bc9..aa64986d06 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,100 +1,130 @@
 <?php
+/**
+ * @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",
+		dbesc($hash)
+	);
 
 
-function regmod_content(&$a) {
+	if (!DBM::is_result($register)) {
+		return false;
+	}
 
-	$_SESSION['return_url'] = $a->cmd;
+	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		intval($register[0]['uid'])
+	);
 
-	if(! local_user()) {
-		notice( t('Please login.') . EOL);
-		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
-		return $o;
+	if (!DBM::is_result($user)) {
+		killme();
 	}
 
-	if((! (x($a->config,'admin_email'))) || ($a->config['admin_email'] !== $a->user['email'])) {
-		notice( t('Permission denied.') . EOL);
-		return '';
+	$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 (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);
+		}
 	}
 
-	if($a->argc != 3)
-		killme();
+	L10n::pushLang($register[0]['language']);
 
-	$cmd  = $a->argv[1];
-	$hash = $a->argv[2];
+	$res = User::sendRegisterOpenEmail(
+		$user[0]['email'],
+		$a->config['sitename'],
+		System::baseUrl(),
+		$user[0]['username'],
+		$register[0]['password']);
+
+	L10n::popLang();
 
+	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)
+{
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
 		dbesc($hash)
 	);
 
-
-	if(! count($register))
-		killme();
+	if (!DBM::is_result($register)) {
+		return false;
+	}
 
 	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($register[0]['uid'])
 	);
 
-	if($cmd === 'deny') {
+	dba::delete('user', ['uid' => $register[0]['uid']]);
+	dba::delete('register', ['hash' => $register[0]['hash']]);
 
-		$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'])
-		); 
+	notice(L10n::t('Registration revoked for %s', $user[0]['username']) . EOL);
+	return true;
+}
 
-		$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;
+function regmod_content(App $a)
+{
+	global $lang;
 
+	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($cmd === 'allow') {
-
-		if(! count($user))
-			killme();
+	if ((!is_site_admin()) || (x($_SESSION, 'submanage') && intval($_SESSION['submanage']))) {
+		notice(L10n::t('Permission denied.') . EOL);
+		return '';
+	}
 
-		$r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
-			dbesc($register[0]['hash'])
-		);
+	if ($a->argc != 3) {
+		killme();
+	}
 
+	$cmd = $a->argv[1];
+	$hash = $a->argv[2];
 
-		$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");
-		}
+	if ($cmd === 'deny') {
+		user_deny($hash);
+		goaway(System::baseUrl() . "/admin/users/");
+		killme();
+	}
 
-		$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'] );
-
-		if($res) {
-			notice( t('Account approved.') . EOL );
-			return;
-		}
+	if ($cmd === 'allow') {
+		user_allow($hash);
+		goaway(System::baseUrl() . "/admin/users/");
+		killme();
 	}
-}
\ No newline at end of file
+}