X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fregmod.php;h=1983ca0899ddbf0608b43bcccb601046c355d44b;hb=1c6535c0b45c32ccbb0e2bd49e5bb7a6d5435d27;hp=772351ac55ab477bf4af2bafb1007be2a6f0512e;hpb=9e35fb26f7aa6c61819f1536189c0102fed29ad9;p=friendica.git
diff --git a/mod/regmod.php b/mod/regmod.php
index 772351ac55..1983ca0899 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,86 +1,137 @@
cmd;
+ $register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
+ dbesc($hash)
+ );
- if(! local_user()) {
- notice( t('Please login.') . EOL);
- $o .= '
' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
- return $o;
+
+ if (! dbm::is_result($register)) {
+ return false;
}
- if($a->argc != 3)
+ $user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+ intval($register[0]['uid'])
+ );
+
+ if (! dbm::is_result($user)) {
killme();
+ }
- $cmd = $a->argv[1];
- $hash = $a->argv[2];
+ $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 = App::get_baseurl() . '/profile/' . $user[0]['nickname'];
+ if ($url && strlen(get_config('system','directory'))) {
+ proc_run(PRIORITY_LOW, "include/directory.php", $url);
+ }
+ }
+
+ push_lang($register[0]['language']);
+
+ send_register_open_eml(
+ $user[0]['email'],
+ $a->config['sitename'],
+ App::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))
- 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') {
+ $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;
+
+}
- $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'])
- );
+function regmod_content(App $a) {
- $r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
- dbesc($register[0]['hash'])
- );
- notice( t('Registration revoked for ') . $user[0]['username'] . EOL);
- return;
+ 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);
+ return $o;
}
- if($cmd === 'allow') {
+ if ((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
+ notice( t('Permission denied.') . EOL);
+ return '';
+ }
- if(! count($user))
- killme();
+ if ($a->argc != 3) {
+ killme();
+ }
- $r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
- dbesc($register[0]['hash'])
- );
+ $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'])
- );
-
- $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'], t('Registration details for '). $a->config['sitename'],
- $email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
+ if ($cmd === 'deny') {
+ user_deny($hash);
+ goaway(App::get_baseurl()."/admin/users/");
+ killme();
+ }
- if($res) {
- notice( t('Account approved.') . EOL );
- return;
- }
+ if ($cmd === 'allow') {
+ user_allow($hash);
+ goaway(App::get_baseurl()."/admin/users/");
+ killme();
}
-}
\ No newline at end of file
+}