X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=11d8eee412eadd013fb2b0197b825803db8baa2c;hb=f3a97a08286a163962b13e928cb0eb4ce191c520;hp=5ed7642005628546069db335f818a55e97fe5971;hpb=4e3d0018c69eaaa122f004357c5c68dacef59fc7;p=friendica.git
diff --git a/mod/regmod.php b/mod/regmod.php
index 5ed7642005..11d8eee412 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,137 +1,130 @@
get_baseurl() . '/profile/' . $user[0]['nickname'];
- if($url && strlen(get_config('system','directory_submit_url')))
- proc_run('php',"include/directory.php","$url");
+ if (DBA::isResult($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']);
+ L10n::pushLang($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 = User::sendRegisterOpenEmail(
+ $user[0]['email'],
+ Config::get('config', 'sitename'),
+ System::baseUrl(),
+ $user[0]['username'],
+ $register[0]['password'],
+ $user[0]);
- $res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'),
- $email_tpl,
- 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
+ L10n::popLang();
- pop_lang();
-
- 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)
+ DBA::escape($hash)
);
- if(! count($register))
+ if (!DBA::isResult($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) {
-
- global $lang;
-
- $_SESSION['return_url'] = $a->cmd;
-
- if(! local_user()) {
- info( t('Please login.') . EOL);
- $o .= '
' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+function regmod_content(App $a)
+{
+ if (!local_user()) {
+ info(L10n::t('Please login.') . EOL);
+ $o = '
' . Login::form($a->query_string, intval(Config::get('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();
}
}