From 606bd0be6016993c57744446cd39b666c85e7342 Mon Sep 17 00:00:00 2001 From: Raroun Date: Tue, 30 Jan 2024 15:18:11 +0100 Subject: [PATCH 1/3] Check if nickname contains only US-ASCII and do not start with a digit Update Register.php --- src/Module/Register.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Module/Register.php b/src/Module/Register.php index def750b3a8..5bf3aff8ff 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -284,7 +284,21 @@ class Register extends BaseModule $regdata = ['email' => $arr['email'], 'nickname' => $arr['nickname'], 'username' => $arr['username']]; DI::baseUrl()->redirect('register?' . http_build_query($regdata)); } - + + //Check if nickname contains only US-ASCII and do not start with a digit + if (!preg_match('/^[a-zA-Z][a-zA-Z0-9]*$/', $arr['nickname'])) { + if (is_numeric(substr($arr['nickname'], 0, 1))) { + Logger::info('Nickname with a leading digit not allowed', $arr); + DI::sysmsg()->addNotice(DI::l10n()->t("Nickname cannot start with a digit.")); + } else { + Logger::info('nickname with non us-ascii characters not allowed', $arr); + DI::sysmsg()->addNotice(DI::l10n()->t("Nickname can only contain US-ASCII characters.")); + } + $regdata = ['email' => $arr['email'], 'nickname' => $arr['nickname'], 'username' => $arr['username']]; + DI::baseUrl()->redirect('register?' . http_build_query($regdata)); + return; + } + $arr['blocked'] = $blocked; $arr['verified'] = $verified; $arr['language'] = L10n::detectLanguage($_SERVER, $_GET, DI::config()->get('system', 'language')); From ed30d888fa4c78475c17df1faee15583f4697518 Mon Sep 17 00:00:00 2001 From: Raroun Date: Tue, 30 Jan 2024 15:28:49 +0100 Subject: [PATCH 2/3] Update src/Module/Register.php Co-authored-by: Hypolite Petovan --- src/Module/Register.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Module/Register.php b/src/Module/Register.php index 5bf3aff8ff..b47c20e6a0 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -288,10 +288,8 @@ class Register extends BaseModule //Check if nickname contains only US-ASCII and do not start with a digit if (!preg_match('/^[a-zA-Z][a-zA-Z0-9]*$/', $arr['nickname'])) { if (is_numeric(substr($arr['nickname'], 0, 1))) { - Logger::info('Nickname with a leading digit not allowed', $arr); DI::sysmsg()->addNotice(DI::l10n()->t("Nickname cannot start with a digit.")); } else { - Logger::info('nickname with non us-ascii characters not allowed', $arr); DI::sysmsg()->addNotice(DI::l10n()->t("Nickname can only contain US-ASCII characters.")); } $regdata = ['email' => $arr['email'], 'nickname' => $arr['nickname'], 'username' => $arr['username']]; From d2f935df1d7b1df47104cb9945d4412e788fcd4c Mon Sep 17 00:00:00 2001 From: Raroun Date: Tue, 30 Jan 2024 15:27:23 +0100 Subject: [PATCH 3/3] Updated messages.po --- view/lang/C/messages.po | 124 +++++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 58 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 56df494ec1..60baac142d 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2024.03-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-29 06:46+0000\n" +"POT-Creation-Date: 2024-01-30 15:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1755,30 +1755,30 @@ msgid "" "Contact birthday events are private to you." msgstr "" -#: src/Content/GroupManager.php:148 src/Content/Nav.php:278 +#: src/Content/GroupManager.php:147 src/Content/Nav.php:278 #: src/Content/Text/HTML.php:881 src/Content/Widget.php:537 #: src/Model/User.php:1381 msgid "Groups" msgstr "" -#: src/Content/GroupManager.php:150 +#: src/Content/GroupManager.php:149 msgid "External link to group" msgstr "" -#: src/Content/GroupManager.php:154 src/Content/Widget.php:512 +#: src/Content/GroupManager.php:153 src/Content/Widget.php:512 msgid "show less" msgstr "" -#: src/Content/GroupManager.php:155 src/Content/Widget.php:410 +#: src/Content/GroupManager.php:154 src/Content/Widget.php:410 #: src/Content/Widget.php:513 msgid "show more" msgstr "" -#: src/Content/GroupManager.php:156 +#: src/Content/GroupManager.php:155 msgid "Create new group" msgstr "" -#: src/Content/Item.php:332 src/Model/Item.php:3244 +#: src/Content/Item.php:332 src/Model/Item.php:3246 msgid "event" msgstr "" @@ -1786,7 +1786,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:341 src/Model/Item.php:3246 +#: src/Content/Item.php:341 src/Model/Item.php:3248 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" @@ -2199,8 +2199,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1005 src/Model/Item.php:3977 -#: src/Model/Item.php:3983 src/Model/Item.php:3984 +#: src/Content/Text/BBCode.php:1005 src/Model/Item.php:3979 +#: src/Model/Item.php:3985 src/Model/Item.php:3986 msgid "Link to source" msgstr "" @@ -2748,8 +2748,8 @@ msgstr "" #: src/Core/Installer.php:516 msgid "" -"The web installer needs to be able to create a file called \"local.config.php" -"\" in the \"config\" folder of your web server and it is unable to do so." +"The web installer needs to be able to create a file called \"local.config." +"php\" in the \"config\" folder of your web server and it is unable to do so." msgstr "" #: src/Core/Installer.php:517 @@ -2867,7 +2867,7 @@ msgstr "" msgid "Could not connect to database." msgstr "" -#: src/Core/L10n.php:444 src/Model/Item.php:2288 +#: src/Core/L10n.php:444 src/Model/Item.php:2290 msgid "Undetermined" msgstr "" @@ -3429,91 +3429,91 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: src/Model/Item.php:2295 +#: src/Model/Item.php:2297 #, php-format msgid "%s (%s - %s): %s" msgstr "" -#: src/Model/Item.php:2297 +#: src/Model/Item.php:2299 #, php-format msgid "%s (%s): %s" msgstr "" -#: src/Model/Item.php:2300 +#: src/Model/Item.php:2302 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:3248 +#: src/Model/Item.php:3250 msgid "activity" msgstr "" -#: src/Model/Item.php:3250 +#: src/Model/Item.php:3252 msgid "comment" msgstr "" -#: src/Model/Item.php:3253 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:3255 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "" -#: src/Model/Item.php:3423 -#, php-format -msgid "%s is blocked" -msgstr "" - #: src/Model/Item.php:3425 #, php-format -msgid "%s is ignored" +msgid "%s is blocked" msgstr "" #: src/Model/Item.php:3427 #, php-format +msgid "%s is ignored" +msgstr "" + +#: src/Model/Item.php:3429 +#, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3431 +#: src/Model/Item.php:3433 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3884 +#: src/Model/Item.php:3886 msgid "bytes" msgstr "" -#: src/Model/Item.php:3915 +#: src/Model/Item.php:3917 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3917 +#: src/Model/Item.php:3919 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3922 +#: src/Model/Item.php:3924 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3924 +#: src/Model/Item.php:3926 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3926 +#: src/Model/Item.php:3928 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3960 src/Model/Item.php:3961 +#: src/Model/Item.php:3962 src/Model/Item.php:3963 msgid "View on separate page" msgstr "" @@ -3909,8 +3909,8 @@ msgid "" "profile\n" "\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n" "\n" -"\t\t\tWe recommend adding a profile photo, adding some profile \"keywords" -"\" (very useful\n" +"\t\t\tWe recommend adding a profile photo, adding some profile " +"\"keywords\" (very useful\n" "\t\t\tin making new friends) - and perhaps what country you live in; if you " "do not wish\n" "\t\t\tto be more specific than that.\n" @@ -5657,9 +5657,9 @@ msgstr "" #: src/Module/Admin/Summary.php:98 msgid "" -"The last update failed. Please run \"php bin/console.php dbstructure update" -"\" from the command line and have a look at the errors that might appear. " -"(Some of the errors are possibly inside the logfile.)" +"The last update failed. Please run \"php bin/console.php dbstructure " +"update\" from the command line and have a look at the errors that might " +"appear. (Some of the errors are possibly inside the logfile.)" msgstr "" #: src/Module/Admin/Summary.php:102 @@ -5810,8 +5810,8 @@ msgstr "" #, php-format msgid "" "Show some informations regarding the needed information to operate the node " -"according e.g. to EU-GDPR." +"according e.g. to EU-GDPR." msgstr "" #: src/Module/Admin/Tos.php:81 @@ -9123,8 +9123,8 @@ msgstr "" #: src/Module/Profile/Profile.php:158 #, php-format msgid "" -"You're currently viewing your profile as %s Cancel" +"You're currently viewing your profile as %s Cancel" msgstr "" #: src/Module/Profile/Profile.php:167 @@ -9361,40 +9361,48 @@ msgstr "" msgid "Please enter the identical mail address in the second field." msgstr "" -#: src/Module/Register.php:310 +#: src/Module/Register.php:292 +msgid "Nickname cannot start with a digit." +msgstr "" + +#: src/Module/Register.php:295 +msgid "Nickname can only contain US-ASCII characters." +msgstr "" + +#: src/Module/Register.php:324 msgid "The additional account was created." msgstr "" -#: src/Module/Register.php:335 +#: src/Module/Register.php:349 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: src/Module/Register.php:342 +#: src/Module/Register.php:356 #, php-format msgid "" "Failed to send email message. Here your accout details:
login: %s
" "password: %s

You can change your password after login." msgstr "" -#: src/Module/Register.php:348 +#: src/Module/Register.php:362 msgid "Registration successful." msgstr "" -#: src/Module/Register.php:357 src/Module/Register.php:364 -#: src/Module/Register.php:374 +#: src/Module/Register.php:371 src/Module/Register.php:378 +#: src/Module/Register.php:388 msgid "Your registration can not be processed." msgstr "" -#: src/Module/Register.php:363 +#: src/Module/Register.php:377 msgid "You have to leave a request note for the admin." msgstr "" -#: src/Module/Register.php:373 +#: src/Module/Register.php:387 msgid "An internal error occured." msgstr "" -#: src/Module/Register.php:395 +#: src/Module/Register.php:409 msgid "Your registration is pending approval by the site owner." msgstr "" @@ -9636,8 +9644,8 @@ msgstr "" #: src/Module/Security/TwoFactor/Verify.php:100 #, php-format msgid "" -"If you do not have access to your authentication code you can use a two-factor recovery code." +"If you do not have access to your authentication code you can use a two-factor recovery code." msgstr "" #: src/Module/Security/TwoFactor/Verify.php:101 @@ -11316,8 +11324,8 @@ msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:152 #, php-format msgid "" -"

Or you can open the following URL in your mobile device:

%s

" +"

Or you can open the following URL in your mobile device:

%s

" msgstr "" #: src/Module/Settings/TwoFactor/Verify.php:159 @@ -11426,9 +11434,9 @@ msgstr "" msgid "" "At any point in time a logged in user can export their account data from the " "account settings. If the user wants " -"to delete their account they can do so at " -"%1$s/settings/removeme. The deletion of the account will be permanent. " -"Deletion of the data will also be requested from the nodes of the " +"to delete their account they can do so at %1$s/settings/removeme. The deletion of the account will be " +"permanent. Deletion of the data will also be requested from the nodes of the " "communication partners." msgstr ""