X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=49845e873191405bfef373066760ede30061d843;hb=86320317f493d0bf26fac7860d2e0c388633ab0c;hp=f5bba6dea0f6131a48b92705b2567822972d770f;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git
diff --git a/mod/regmod.php b/mod/regmod.php
index f5bba6dea0..49845e8731 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,68 +1,53 @@
false, 'verified' => true], ['uid' => $register['uid']]);
- $r = q("UPDATE `user` SET `blocked` = 0, `verified` = 1 WHERE `uid` = %d",
- intval($register[0]['uid'])
- );
+ $profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid'], 'is-default' => true]);
- $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 (DBA::isResult($profile) && $profile['net-publish'] && Config::get('system', 'directory')) {
+ $url = DI::baseUrl() . '/profile/' . $user['nickname'];
+ Worker::add(PRIORITY_LOW, "Directory", $url);
}
- push_lang($register[0]['language']);
-
- User::sendRegisterOpenEmail(
- $user[0]['email'],
- $a->config['sitename'],
- System::baseUrl(),
- $user[0]['username'],
- $register[0]['password']);
+ $l10n = L10n::withLang($register['language']);
- pop_lang();
+ $res = User::sendRegisterOpenEmail(
+ $l10n,
+ $user,
+ Config::get('config', 'sitename'),
+ DI::baseUrl()->get(),
+ ($register['password'] ?? '') ?: 'Sent in a previous email'
+ );
if ($res) {
- info(t('Account approved.') . EOL);
+ info(L10n::t('Account approved.') . EOL);
return true;
}
}
@@ -72,42 +57,38 @@ function user_allow($hash)
// allowed to have friends on this system
function user_deny($hash)
{
- $register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
- dbesc($hash)
- );
-
- if (!DBM::is_result($register)) {
+ $register = Register::getByHash($hash);
+ if (!DBA::isResult($register)) {
return false;
}
- $user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
- intval($register[0]['uid'])
- );
+ $user = User::getById($register['uid']);
+ if (!DBA::isResult($user)) {
+ exit();
+ }
- dba::delete('user', ['uid' => $register[0]['uid']]);
- dba::delete('register', ['hash' => $register[0]['hash']]);
+ DBA::delete('user', ['uid' => $register['uid']]);
- notice(sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+ Register::deleteByHash($register['hash']);
+
+ notice(L10n::t('Registration revoked for %s', $user['username']) . EOL);
return true;
}
function regmod_content(App $a)
{
- global $lang;
-
if (!local_user()) {
- info(t('Please login.') . EOL);
- $o .= '
' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
- return $o;
+ info(L10n::t('Please login.') . EOL);
+ return Login::form(DI::args()->getQueryString(), intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 0 : 1);
}
- if ((!is_site_admin()) || (x($_SESSION, 'submanage') && intval($_SESSION['submanage']))) {
- notice(t('Permission denied.') . EOL);
+ if (!is_site_admin() || !empty($_SESSION['submanage'])) {
+ notice(L10n::t('Permission denied.') . EOL);
return '';
}
if ($a->argc != 3) {
- killme();
+ exit();
}
$cmd = $a->argv[1];
@@ -115,13 +96,11 @@ function regmod_content(App $a)
if ($cmd === 'deny') {
user_deny($hash);
- goaway(System::baseUrl() . "/admin/users/");
- killme();
+ DI::baseUrl()->redirect('admin/users/');
}
if ($cmd === 'allow') {
user_allow($hash);
- goaway(System::baseUrl() . "/admin/users/");
- killme();
+ DI::baseUrl()->redirect('admin/users/');
}
}