fix redirection - works now with logged in users, remote users, guests and visitors

[friendica.git] / mod / regmod.php

diff --git a/mod/regmod.php b/mod/regmod.php
index 3c860120882fd0d54f071f9e48b9fa92bec00174..aa64986d069e486891ab6ebaeecf76696569c8cf 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,12 +1,20 @@
 <?php
-
+/**
+ * @file mod/regmod.php
+ */
 use Friendica\App;
-
-require_once('include/enotify.php');
-require_once('include/user.php');
-
-function user_allow($hash) {
-
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\User;
+use Friendica\Module\Login;
+
+require_once 'include/enotify.php';
+
+function user_allow($hash)
+{
        $a = get_app();
 
        $register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
@@ -14,7 +22,7 @@ function user_allow($hash) {
        );
 
 
-       if (! dbm::is_result($register)) {
+       if (!DBM::is_result($register)) {
                return false;
        }
 
@@ -22,7 +30,7 @@ function user_allow($hash) {
                intval($register[0]['uid'])
        );
 
-       if (! dbm::is_result($user)) {
+       if (!DBM::is_result($user)) {
                killme();
        }
 
@@ -38,43 +46,40 @@ 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']);
+       L10n::pushLang($register[0]['language']);
 
-       send_register_open_eml(
+       $res = User::sendRegisterOpenEmail(
                $user[0]['email'],
                $a->config['sitename'],
-               App::get_baseurl(),
+               System::baseUrl(),
                $user[0]['username'],
                $register[0]['password']);
 
-       pop_lang();
+       L10n::popLang();
 
-       if($res) {
-               info( t('Account approved.') . EOL );
+       if ($res) {
+               info(L10n::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) {
-
+function user_deny($hash)
+{
        $register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
                dbesc($hash)
        );
 
-       if (!dbm::is_result($register)) {
+       if (!DBM::is_result($register)) {
                return false;
        }
 
@@ -82,28 +87,25 @@ function user_deny($hash) {
                intval($register[0]['uid'])
        );
 
-       dba::delete('user', array('uid' => $register[0]['uid']));
-       dba::delete('register', array('hash' => $register[0]['hash']));
+       dba::delete('user', ['uid' => $register[0]['uid']]);
+       dba::delete('register', ['hash' => $register[0]['hash']]);
 
-       notice(sprintf(t('Registration revoked for %s'), $user[0]['username']) . EOL);
+       notice(L10n::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()) {
-               info( t('Please login.') . EOL);
-               $o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+       if (!local_user()) {
+               info(L10n::t('Please login.') . EOL);
+               $o = '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
                return $o;
        }
 
-       if ((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
-               notice( t('Permission denied.') . EOL);
+       if ((!is_site_admin()) || (x($_SESSION, 'submanage') && intval($_SESSION['submanage']))) {
+               notice(L10n::t('Permission denied.') . EOL);
                return '';
        }
 
@@ -111,20 +113,18 @@ function regmod_content(App $a) {
                killme();
        }
 
-       $cmd  = $a->argv[1];
+       $cmd = $a->argv[1];
        $hash = $a->argv[2];
 
-
-
        if ($cmd === 'deny') {
                user_deny($hash);
-               goaway(App::get_baseurl()."/admin/users/");
+               goaway(System::baseUrl() . "/admin/users/");
                killme();
        }
 
        if ($cmd === 'allow') {
                user_allow($hash);
-               goaway(App::get_baseurl()."/admin/users/");
+               goaway(System::baseUrl() . "/admin/users/");
                killme();
        }
 }