X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fregmod.php;h=bbe733003a56dfe11ea9affceabd03f7be00fcb0;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=eabbec090b92ef9d445f58951f8b1fbd058db786;hpb=bb0c24bd4fd159cc005f60a0808a4b37b91060b0;p=friendica.git
diff --git a/mod/regmod.php b/mod/regmod.php
index eabbec090b..bbe733003a 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,18 +1,112 @@
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'],
+ $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 .= '
' . 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,68 +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( t('Registration revoked for ') . $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'])
- );
-
- $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($res) {
- notice( t('Account approved.') . EOL );
- return;
- }
+ user_allow($hash);
+ goaway($a->get_baseurl()."/admin/users/");
+ killme();
}
-}
\ No newline at end of file
+}