Merge pull request #7828 from nupplaphil/task/move_enotify

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

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 367eeb5adee31f84fa039afe5e65efb8055719d8..ad49555e699d77bd4aa06b24b085c977756e9a9a 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -35,7 +35,7 @@ class Register extends BaseModule
         *
         * @return string
         */
-       public static function content()
+       public static function content(array $parameters = [])
        {
                // logged in users can register others (people/pages/groups)
                // even with closed registrations, unless specifically prohibited by site policy.
@@ -62,12 +62,12 @@ class Register extends BaseModule
                        }
                }
 
-               $username   = defaults($_REQUEST, 'username'  , '');
-               $email      = defaults($_REQUEST, 'email'     , '');
-               $openid_url = defaults($_REQUEST, 'openid_url', '');
-               $nickname   = defaults($_REQUEST, 'nickname'  , '');
-               $photo      = defaults($_REQUEST, 'photo'     , '');
-               $invite_id  = defaults($_REQUEST, 'invite_id' , '');
+               $username   = $_REQUEST['username']   ?? '';
+               $email      = $_REQUEST['email']      ?? '';
+               $openid_url = $_REQUEST['openid_url'] ?? '';
+               $nickname   = $_REQUEST['nickname']   ?? '';
+               $photo      = $_REQUEST['photo']      ?? '';
+               $invite_id  = $_REQUEST['invite_id']  ?? '';
 
                if (Config::get('system', 'no_openid')) {
                        $fillwith = '';
@@ -152,7 +152,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()
+       public static function post(array $parameters = [])
        {
                BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 
@@ -261,6 +261,11 @@ class Register extends BaseModule
 
                                $a->internalRedirect('register/');
                        }
+                       // Is there text in the tar pit?
+                       if (!empty($_POST['registertarpit'])) {
+                               \notice(L10n::t('You have entered too much information.'));
+                               $a->internalRedirect('register/');
+                       }
 
                        Model\Register::createForApproval($user['uid'], Config::get('system', 'language'), $_POST['permonlybox']);
 
@@ -290,7 +295,7 @@ class Register extends BaseModule
                                        'source_photo' => $base_url . '/photo/avatar/' . $user['uid'] . '.jpg',
                                        'to_email'     => $admin['email'],
                                        'uid'          => $admin['uid'],
-                                       'language'     => defaults($admin, 'language', 'en'),
+                                       'language'     => ($admin['language'] ?? '') ?: 'en',
                                        'show_in_notification_page' => false
                                ]);
                        }