Merge pull request #3047 from annando/1612-indexlength

[friendica.git] / mod / regmod.php

diff --git a/mod/regmod.php b/mod/regmod.php
index 5ed7642005628546069db335f818a55e97fe5971..34d29a77cecfee8360b9d2e63822876483a47e41 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,6 +1,7 @@
 <?php
 
-require_once('include/email.php');
+require_once('include/enotify.php');
+require_once('include/user.php');
 
 function user_allow($hash) {
 
@@ -17,52 +18,44 @@ function user_allow($hash) {
        $user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                intval($register[0]['uid'])
        );
-       
+
        if(! count($user))
                killme();
 
-       $r = q("DELETE FROM `register` WHERE `hash` = '%s' LIMIT 1",
+       $r = q("DELETE FROM `register` WHERE `hash` = '%s'",
                dbesc($register[0]['hash'])
        );
 
 
-       $r = q("UPDATE `user` SET `blocked` = 0, `verified` = 1 WHERE `uid` = %d LIMIT 1",
+       $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(count($r) && $r[0]['net-publish']) {
-               $url = $a->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'], 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' );
+       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;
-       }       
+       }
 
 }
 
@@ -83,23 +76,23 @@ function user_deny($hash) {
        $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) {
@@ -108,30 +101,35 @@ function regmod_content(&$a) {
 
        $_SESSION['return_url'] = $a->cmd;
 
-       if(! local_user()) {
+       if (! local_user()) {
                info( t('Please login.') . EOL);
                $o .= '<br /><br />' . 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();
        }
 }