X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fregmod.php;h=1983ca0899ddbf0608b43bcccb601046c355d44b;hb=1c6535c0b45c32ccbb0e2bd49e5bb7a6d5435d27;hp=21f41eb01ccc3c854443f22e3465ba50cc3797fa;hpb=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git
diff --git a/mod/regmod.php b/mod/regmod.php
index 21f41eb01c..1983ca0899 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,5 +1,8 @@
get_baseurl() . '/profile/' . $user[0]['nickname'];
- if($url && strlen(get_config('system','directory_submit_url')))
- proc_run('php',"include/directory.php","$url");
+ 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']);
- $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 = mail($user[0]['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
- $email_tpl,
- 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
- . 'Content-type: text/plain; charset=UTF-8' . "\n"
- . 'Content-transfer-encoding: 8bit' );
+ 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;
- }
+ }
}
@@ -75,61 +72,66 @@ function user_deny($hash) {
dbesc($hash)
);
- if(! count($register))
+ if(! dbm::is_result($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",
+
+ $r = q("DELETE FROM `user` WHERE `uid` = %d",
intval($register[0]['uid'])
);
- $r = q("DELETE FROM `contact` WHERE `uid` = %d LIMIT 1",
+ $r = q("DELETE FROM `contact` WHERE `uid` = %d",
intval($register[0]['uid'])
- );
- $r = q("DELETE FROM `profile` WHERE `uid` = %d LIMIT 1",
+ );
+ $r = q("DELETE FROM `profile` WHERE `uid` = %d",
intval($register[0]['uid'])
- );
+ );
- $r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
+ $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) {
+function regmod_content(App $a) {
global $lang;
$_SESSION['return_url'] = $a->cmd;
- if(! local_user()) {
+ if (! local_user()) {
info( t('Please login.') . EOL);
$o .= '
' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
return $o;
}
- if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
+ if ((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
notice( t('Permission denied.') . EOL);
return '';
}
- if($a->argc != 3)
+ if ($a->argc != 3) {
killme();
+ }
$cmd = $a->argv[1];
$hash = $a->argv[2];
- if($cmd === 'deny') {
- if (!user_deny($hash)) killme();
+ if ($cmd === 'deny') {
+ user_deny($hash);
+ goaway(App::get_baseurl()."/admin/users/");
+ killme();
}
- if($cmd === 'allow') {
- if (!user_allow($hash)) killme();
+ if ($cmd === 'allow') {
+ user_allow($hash);
+ goaway(App::get_baseurl()."/admin/users/");
+ killme();
}
}