Merge pull request #3965 from tobiasd/20171126-docGettingStarted

[friendica.git] / mod / regmod.php

diff --git a/mod/regmod.php b/mod/regmod.php
index d20383ba53846864d655ed7716fefb81b1082f53..6d76e7ea7eb7f8814d892283ace04fa144782aac 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,5 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+
 require_once('include/enotify.php');
 require_once('include/user.php');
 
@@ -12,7 +18,7 @@ function user_allow($hash) {
        );
 
 
-       if (! dbm::is_result($register)) {
+       if (! DBM::is_result($register)) {
                return false;
        }
 
@@ -20,7 +26,7 @@ function user_allow($hash) {
                intval($register[0]['uid'])
        );
 
-       if (! dbm::is_result($user)) {
+       if (! DBM::is_result($user)) {
                killme();
        }
 
@@ -36,10 +42,11 @@ function user_allow($hash) {
        $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);
+       if (DBM::is_result($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']);
@@ -47,7 +54,7 @@ function user_allow($hash) {
        send_register_open_eml(
                $user[0]['email'],
                $a->config['sitename'],
-               App::get_baseurl(),
+               System::baseUrl(),
                $user[0]['username'],
                $register[0]['password']);
 
@@ -71,65 +78,57 @@ function user_deny($hash) {
                dbesc($hash)
        );
 
-       if(! dbm::is_result($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",
-               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'])
-       );
+       dba::delete('user', array('uid' => $register[0]['uid']));
+       dba::delete('register', array('hash' => $register[0]['hash']));
 
-       $r = q("DELETE FROM `register` WHERE `hash` = '%s'",
-               dbesc($register[0]['hash'])
-       );
-       notice( sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+       notice(sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
        return true;
 
 }
 
-function regmod_content(App &$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 .= '<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 ($cmd === 'deny') {
                user_deny($hash);
-               goaway(App::get_baseurl()."/admin/users/");
+               goaway(System::baseUrl()."/admin/users/");
                killme();
        }
 
-       if($cmd === 'allow') {
+       if ($cmd === 'allow') {
                user_allow($hash);
-               goaway(App::get_baseurl()."/admin/users/");
+               goaway(System::baseUrl()."/admin/users/");
                killme();
        }
 }