Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / Register.php

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 3e50de8972f732d617fc5c9e7526c0367403911e..fca59a2c85f14e696080404fe46452001115e026 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,6 +31,8 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
+use Friendica\Model\User;
+use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 
 /**
@@ -51,7 +53,7 @@ class Register extends BaseModule
         *
         * @return string
         */
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                // logged in users can register others (people/pages/groups)
                // even with closed registrations, unless specifically prohibited by site policy.
@@ -80,7 +82,7 @@ class Register extends BaseModule
                if ($max_dailies) {
                        $count = DBA::count('user', ['`register_date` > UTC_TIMESTAMP - INTERVAL 1 day']);
                        if ($count >= $max_dailies) {
-                               Logger::log('max daily registrations exceeded.');
+                               Logger::notice('max daily registrations exceeded.');
                                notice(DI::l10n()->t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.'));
                                return '';
                        }
@@ -127,7 +129,7 @@ class Register extends BaseModule
 
                $tpl = $arr['template'];
 
-               $tos = new Tos();
+               $tos = new Tos($this->parameters);
 
                $o = Renderer::replaceMacros($tpl, [
                        '$invitations'  => DI::config()->get('system', 'invitation_only'),
@@ -180,7 +182,7 @@ class Register extends BaseModule
         * Extend this method if the module is supposed to process POST requests.
         * Doesn't display any content
         */
-       public static function post(array $parameters = [])
+       public function post()
        {
                BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 
@@ -248,10 +250,6 @@ class Register extends BaseModule
                        DI::baseUrl()->redirect('register/');
                }
 
-
-               // Overwriting the "tar pit" field with the real one
-               $arr['email'] = $arr['field1'];
-
                if ($additional_account) {
                        $user = DBA::selectFirst('user', ['email'], ['uid' => local_user()]);
                        if (!DBA::isResult($user)) {
@@ -264,6 +262,9 @@ class Register extends BaseModule
 
                        $arr['password1'] = $arr['confirm'] = $arr['parent_password'];
                        $arr['repeat'] = $arr['email'] = $user['email'];
+               } else {
+                       // Overwriting the "tar pit" field with the real one
+                       $arr['email'] = $arr['field1'];
                }
 
                if ($arr['email'] != $arr['repeat']) {
@@ -301,7 +302,7 @@ class Register extends BaseModule
 
                $using_invites = DI::config()->get('system', 'invitation_only');
                $num_invites   = DI::config()->get('system', 'number_invites');
-               $invite_id = (!empty($_POST['invite_id']) ? Strings::escapeTags(trim($_POST['invite_id'])) : '');
+               $invite_id = (!empty($_POST['invite_id']) ? trim($_POST['invite_id']) : '');
 
                if (intval(DI::config()->get('config', 'register_policy')) === self::OPEN) {
                        if ($using_invites && $invite_id) {
@@ -364,8 +365,8 @@ class Register extends BaseModule
 
                        // send notification to admins
                        while ($admin = DBA::fetch($admins_stmt)) {
-                               \notification([
-                                       'type'         => Model\Notify\Type::SYSTEM,
+                               DI::notify()->createFromArray([
+                                       'type'         => Model\Notification\Type::SYSTEM,
                                        'event'        => 'SYSTEM_REGISTER_REQUEST',
                                        'uid'          => $admin['uid'],
                                        'link'         => $base_url . '/admin/users/',
@@ -373,7 +374,7 @@ class Register extends BaseModule
                                        'source_mail'  => $user['email'],
                                        'source_nick'  => $user['nickname'],
                                        'source_link'  => $base_url . '/admin/users/',
-                                       'source_photo' => $base_url . '/photo/avatar/' . $user['uid'] . '.jpg',
+                                       'source_photo' => User::getAvatarUrl($user, Proxy::SIZE_THUMB),
                                        'show_in_notification_page' => false
                                ]);
                        }