tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12694 from MrPetovan/task/allow-colon

Browse source 
Allow colon in password
This commit is contained in:
Philipp 2023-01-19 08:08:35 +01:00 committed by GitHub
parent 16e1c8f893 da4441875d
commit 9c0f4dd9e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 115 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/User.php
View file

@ -757,7 +757,7 @@ class User
} }
/** /**
* Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:). * Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters.
* *
* Password length is limited to 72 characters if the current default password hashing algorithm is Blowfish. * Password length is limited to 72 characters if the current default password hashing algorithm is Blowfish.
* From the manual: "Using the PASSWORD_BCRYPT as the algorithm, will result in the password parameter being * From the manual: "Using the PASSWORD_BCRYPT as the algorithm, will result in the password parameter being
@ -770,13 +770,13 @@ class User
*/ */
public static function getPasswordRegExp(string $delimiter = null): string public static function getPasswordRegExp(string $delimiter = null): string
{ {
$allowed_characters = '!"#$%&\'()*+,-./;<=>?@[\]^_`{|}~'; $allowed_characters = ':!"#$%&\'()*+,-./;<=>?@[\]^_`{|}~';
if ($delimiter) { if ($delimiter) {
$allowed_characters = preg_quote($allowed_characters, $delimiter); $allowed_characters = preg_quote($allowed_characters, $delimiter);
} }
return '^[a-zA-Z0-9' . $allowed_characters . ']' . (PASSWORD_DEFAULT !== PASSWORD_BCRYPT ? '{1,72}' : '+') . '$'; return '^[a-zA-Z0-9' . $allowed_characters . ']' . (PASSWORD_DEFAULT === PASSWORD_BCRYPT ? '{1,72}' : '+') . '$';
} }
/** /**
@ -804,7 +804,7 @@ class User
} }
if (!preg_match('/' . self::getPasswordRegExp('/') . '/', $password)) { if (!preg_match('/' . self::getPasswordRegExp('/') . '/', $password)) {
throw new Exception(DI::l10n()->t('The password can\'t contain accentuated letters, white spaces or colons (:)')); throw new Exception(DI::l10n()->t("The password can't contain white spaces nor accentuated letters"));
} }
return self::updatePasswordHashed($uid, self::hashPassword($password)); return self::updatePasswordHashed($uid, self::hashPassword($password));

5
src/Module/OAuth/Token.php
View file

@ -61,7 +61,10 @@ class Token extends BaseApi
} }
if (empty($request['client_id']) && substr($authorization, 0, 6) == 'Basic ') { if (empty($request['client_id']) && substr($authorization, 0, 6) == 'Basic ') {
$datapair = explode(':', base64_decode(trim(substr($authorization, 6)))); // Per RFC2617, usernames can't contain a colon but password can,
// so we cut on the first colon to obtain the username and the password
// @see https://www.rfc-editor.org/rfc/rfc2617#section-2
$datapair = explode(':', base64_decode(trim(substr($authorization, 6))), 2);
if (count($datapair) == 2) { if (count($datapair) == 2) {
$request['client_id'] = $datapair[0]; $request['client_id'] = $datapair[0];
$request['client_secret'] = $datapair[1]; $request['client_secret'] = $datapair[1];

2
src/Module/Security/PasswordTooLong.php
View file

@ -98,7 +98,7 @@ class PasswordTooLong extends \Friendica\BaseModule
'$return_url' => $request['return_url'] ?? '', '$return_url' => $request['return_url'] ?? '',
'$password_current' => ['password_current', $this->l10n->t('Current Password:'), '', $this->l10n->t('Your current password to confirm the changes'), 'required', 'autocomplete="off"'], '$password_current' => ['password_current', $this->l10n->t('Current Password:'), '', $this->l10n->t('Your current password to confirm the changes'), 'required', 'autocomplete="off"'],
'$password' => ['password', $this->l10n->t('New Password:'), '', $this->l10n->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).') . ' ' . $this->l10n->t('Password length is limited to 72 characters.'), 'required', 'autocomplete="off"', User::getPasswordRegExp()], '$password' => ['password', $this->l10n->t('New Password:'), '', $this->l10n->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters.') . ' ' . $this->l10n->t('Password length is limited to 72 characters.'), 'required', 'autocomplete="off"', User::getPasswordRegExp()],
'$password_confirm' => ['password_confirm', $this->l10n->t('Confirm:'), '', '', 'required', 'autocomplete="off"'], '$password_confirm' => ['password_confirm', $this->l10n->t('Confirm:'), '', '', 'required', 'autocomplete="off"'],
]); ]);

2
src/Module/Settings/Account.php
View file

@ -549,7 +549,7 @@ class Account extends BaseSettings
$notify_type = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'notify_type'); $notify_type = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'notify_type');
$passwordRules = DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces, accentuated letters and colon (:).') $passwordRules = DI::l10n()->t('Allowed characters are a-z, A-Z, 0-9 and special characters except white spaces and accentuated letters.')
. (PASSWORD_DEFAULT === PASSWORD_BCRYPT ? ' ' . DI::l10n()->t('Password length is limited to 72 characters.') : ''); . (PASSWORD_DEFAULT === PASSWORD_BCRYPT ? ' ' . DI::l10n()->t('Password length is limited to 72 characters.') : '');
$tpl = Renderer::getMarkupTemplate('settings/account.tpl'); $tpl = Renderer::getMarkupTemplate('settings/account.tpl');

211
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2023.03-dev\n" "Project-Id-Version: 2023.03-dev\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-01-14 21:19+0000\n" "POT-Creation-Date: 2023-01-18 20:40-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -49,7 +49,7 @@ msgstr ""
#: src/Module/Attach.php:55 src/Module/BaseApi.php:95 #: src/Module/Attach.php:55 src/Module/BaseApi.php:95
#: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
#: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84 #: src/Module/Calendar/Event/API.php:88 src/Module/Calendar/Event/Form.php:84
#: src/Module/Calendar/Export.php:62 src/Module/Calendar/Show.php:82 #: src/Module/Calendar/Export.php:82 src/Module/Calendar/Show.php:82
#: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:86 #: src/Module/Contact/Advanced.php:60 src/Module/Contact/Follow.php:86
#: src/Module/Contact/Follow.php:159 src/Module/Contact/MatchInterests.php:86 #: src/Module/Contact/Follow.php:159 src/Module/Contact/MatchInterests.php:86
#: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66 #: src/Module/Contact/Suggestions.php:54 src/Module/Contact/Unfollow.php:66
@ -385,7 +385,7 @@ msgstr ""
#: mod/photos.php:67 mod/photos.php:132 mod/photos.php:577 #: mod/photos.php:67 mod/photos.php:132 mod/photos.php:577
#: src/Model/Event.php:514 src/Model/Profile.php:234 #: src/Model/Event.php:514 src/Model/Profile.php:234
#: src/Module/Calendar/Export.php:67 src/Module/Calendar/Show.php:74 #: src/Module/Calendar/Export.php:74 src/Module/Calendar/Show.php:74
#: src/Module/DFRN/Poll.php:43 src/Module/Feed.php:65 src/Module/HCard.php:51 #: src/Module/DFRN/Poll.php:43 src/Module/Feed.php:65 src/Module/HCard.php:51
#: src/Module/Profile/Common.php:62 src/Module/Profile/Common.php:71 #: src/Module/Profile/Common.php:62 src/Module/Profile/Common.php:71
#: src/Module/Profile/Contacts.php:64 src/Module/Profile/Contacts.php:72 #: src/Module/Profile/Contacts.php:64 src/Module/Profile/Contacts.php:72
@ -649,11 +649,11 @@ msgstr ""
msgid "Map" msgid "Map"
msgstr "" msgstr ""
#: src/App.php:472 #: src/App.php:470
msgid "No system theme config value set." msgid "No system theme config value set."
msgstr "" msgstr ""
#: src/App.php:594 #: src/App.php:592
msgid "Apologies but the website is unavailable at the moment." msgid "Apologies but the website is unavailable at the moment."
msgstr "" msgstr ""
@ -1877,9 +1877,9 @@ msgstr ""
#: src/Content/Nav.php:335 src/Module/BaseModeration.php:127 #: src/Content/Nav.php:335 src/Module/BaseModeration.php:127
#: src/Module/Moderation/Blocklist/Contact.php:110 #: src/Module/Moderation/Blocklist/Contact.php:110
#: src/Module/Moderation/Blocklist/Server/Add.php:119 #: src/Module/Moderation/Blocklist/Server/Add.php:121
#: src/Module/Moderation/Blocklist/Server/Import.php:115 #: src/Module/Moderation/Blocklist/Server/Import.php:118
#: src/Module/Moderation/Blocklist/Server/Index.php:92 #: src/Module/Moderation/Blocklist/Server/Index.php:95
#: src/Module/Moderation/Item/Delete.php:61 #: src/Module/Moderation/Item/Delete.php:61
#: src/Module/Moderation/Summary.php:76 #: src/Module/Moderation/Summary.php:76
#: src/Module/Moderation/Users/Active.php:133 #: src/Module/Moderation/Users/Active.php:133
@ -3296,7 +3296,7 @@ msgstr ""
msgid "Title/Description:" msgid "Title/Description:"
msgstr "" msgstr ""
#: src/Model/Profile.php:1023 src/Module/Admin/Summary.php:222 #: src/Model/Profile.php:1023 src/Module/Admin/Summary.php:220
#: src/Module/Moderation/Summary.php:77 #: src/Module/Moderation/Summary.php:77
msgid "Summary" msgid "Summary"
msgstr "" msgstr ""
@ -3368,8 +3368,7 @@ msgid "The password length is limited to 72 characters."
msgstr "" msgstr ""
#: src/Model/User.php:807 #: src/Model/User.php:807
msgid "" msgid "The password can't contain white spaces nor accentuated letters"
"The password can't contain accentuated letters, white spaces or colons (:)"
msgstr "" msgstr ""
#: src/Model/User.php:1002 #: src/Model/User.php:1002
@ -3624,7 +3623,7 @@ msgstr ""
#: src/Module/Admin/Federation.php:207 src/Module/Admin/Logs/Settings.php:79 #: src/Module/Admin/Federation.php:207 src/Module/Admin/Logs/Settings.php:79
#: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72 #: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72
#: src/Module/Admin/Site.php:435 src/Module/Admin/Storage.php:138 #: src/Module/Admin/Site.php:435 src/Module/Admin/Storage.php:138
#: src/Module/Admin/Summary.php:221 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Summary.php:219 src/Module/Admin/Themes/Details.php:90
#: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:77 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:77
#: src/Module/Moderation/Users/Create.php:61 #: src/Module/Moderation/Users/Create.php:61
#: src/Module/Moderation/Users/Pending.php:96 #: src/Module/Moderation/Users/Pending.php:96
@ -5007,12 +5006,12 @@ msgstr ""
msgid "Database (legacy)" msgid "Database (legacy)"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:57 #: src/Module/Admin/Summary.php:55
#, php-format #, php-format
msgid "Template engine (%s) error: %s" msgid "Template engine (%s) error: %s"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:61 #: src/Module/Admin/Summary.php:59
#, php-format #, php-format
msgid "" msgid ""
"Your DB still runs with MyISAM tables. You should change the engine type to " "Your DB still runs with MyISAM tables. You should change the engine type to "
@ -5023,7 +5022,7 @@ msgid ""
"automatic conversion.<br />" "automatic conversion.<br />"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:66 #: src/Module/Admin/Summary.php:64
#, php-format #, php-format
msgid "" msgid ""
"Your DB still runs with InnoDB tables in the Antelope file format. You " "Your DB still runs with InnoDB tables in the Antelope file format. You "
@ -5034,7 +5033,7 @@ msgid ""
"installation for an automatic conversion.<br />" "installation for an automatic conversion.<br />"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:76 #: src/Module/Admin/Summary.php:74
#, php-format #, php-format
msgid "" msgid ""
"Your table_definition_cache is too low (%d). This can lead to the database " "Your table_definition_cache is too low (%d). This can lead to the database "
@ -5042,39 +5041,39 @@ msgid ""
"to %d. See <a href=\"%s\">here</a> for more information.<br />" "to %d. See <a href=\"%s\">here</a> for more information.<br />"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:86 #: src/Module/Admin/Summary.php:84
#, php-format #, php-format
msgid "" msgid ""
"There is a new version of Friendica available for download. Your current " "There is a new version of Friendica available for download. Your current "
"version is %1$s, upstream version is %2$s" "version is %1$s, upstream version is %2$s"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:95 #: src/Module/Admin/Summary.php:93
msgid "" msgid ""
"The database update failed. Please run \"php bin/console.php dbstructure " "The database update failed. Please run \"php bin/console.php dbstructure "
"update\" from the command line and have a look at the errors that might " "update\" from the command line and have a look at the errors that might "
"appear." "appear."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:99 #: src/Module/Admin/Summary.php:97
msgid "" msgid ""
"The last update failed. Please run \"php bin/console.php dbstructure update" "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. " "\" from the command line and have a look at the errors that might appear. "
"(Some of the errors are possibly inside the logfile.)" "(Some of the errors are possibly inside the logfile.)"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:104 #: src/Module/Admin/Summary.php:102
msgid "The worker was never executed. Please check your database structure!" msgid "The worker was never executed. Please check your database structure!"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:106 #: src/Module/Admin/Summary.php:104
#, php-format #, php-format
msgid "" msgid ""
"The last worker execution was on %s UTC. This is older than one hour. Please " "The last worker execution was on %s UTC. This is older than one hour. Please "
"check your crontab settings." "check your crontab settings."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:111 #: src/Module/Admin/Summary.php:109
#, php-format #, php-format
msgid "" msgid ""
"Friendica's configuration now is stored in config/local.config.php, please " "Friendica's configuration now is stored in config/local.config.php, please "
@ -5083,7 +5082,7 @@ msgid ""
"with the transition." "with the transition."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:115 #: src/Module/Admin/Summary.php:113
#, php-format #, php-format
msgid "" msgid ""
"Friendica's configuration now is stored in config/local.config.php, please " "Friendica's configuration now is stored in config/local.config.php, please "
@ -5092,7 +5091,7 @@ msgid ""
"with the transition." "with the transition."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:119 #: src/Module/Admin/Summary.php:117
#, php-format #, php-format
msgid "" msgid ""
"Friendica's configuration store \"%s\" isn't writable. Until then database " "Friendica's configuration store \"%s\" isn't writable. Until then database "
@ -5100,7 +5099,7 @@ msgid ""
"configuration changes won't be saved." "configuration changes won't be saved."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:125 #: src/Module/Admin/Summary.php:123
#, php-format #, php-format
msgid "" msgid ""
"<a href=\"%s\">%s</a> is not reachable on your system. This is a severe " "<a href=\"%s\">%s</a> is not reachable on your system. This is a severe "
@ -5108,50 +5107,50 @@ msgid ""
"href=\"%s\">the installation page</a> for help." "href=\"%s\">the installation page</a> for help."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:143 #: src/Module/Admin/Summary.php:141
#, php-format #, php-format
msgid "The logfile '%s' is not usable. No logging possible (error: '%s')" msgid "The logfile '%s' is not usable. No logging possible (error: '%s')"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:157 #: src/Module/Admin/Summary.php:155
#, php-format #, php-format
msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')" msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:173 #: src/Module/Admin/Summary.php:171
#, php-format #, php-format
msgid "" msgid ""
"Friendica's system.basepath was updated from '%s' to '%s'. Please remove the " "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the "
"system.basepath from your db to avoid differences." "system.basepath from your db to avoid differences."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:181 #: src/Module/Admin/Summary.php:179
#, php-format #, php-format
msgid "" msgid ""
"Friendica's current system.basepath '%s' is wrong and the config file '%s' " "Friendica's current system.basepath '%s' is wrong and the config file '%s' "
"isn't used." "isn't used."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:189 #: src/Module/Admin/Summary.php:187
#, php-format #, php-format
msgid "" msgid ""
"Friendica's current system.basepath '%s' is not equal to the config file " "Friendica's current system.basepath '%s' is not equal to the config file "
"'%s'. Please fix your configuration." "'%s'. Please fix your configuration."
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:200 #: src/Module/Admin/Summary.php:198
msgid "Message queues" msgid "Message queues"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:206 #: src/Module/Admin/Summary.php:204
msgid "Server Settings" msgid "Server Settings"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:224 #: src/Module/Admin/Summary.php:222
msgid "Version" msgid "Version"
msgstr "" msgstr ""
#: src/Module/Admin/Summary.php:228 #: src/Module/Admin/Summary.php:226
msgid "Active addons" msgid "Active addons"
msgstr "" msgstr ""
@ -5543,13 +5542,13 @@ msgstr ""
#: src/Module/Install.php:286 src/Module/Install.php:291 #: src/Module/Install.php:286 src/Module/Install.php:291
#: src/Module/Install.php:305 src/Module/Install.php:320 #: src/Module/Install.php:305 src/Module/Install.php:320
#: src/Module/Install.php:347 #: src/Module/Install.php:347
#: src/Module/Moderation/Blocklist/Server/Add.php:134
#: src/Module/Moderation/Blocklist/Server/Add.php:136 #: src/Module/Moderation/Blocklist/Server/Add.php:136
#: src/Module/Moderation/Blocklist/Server/Import.php:126 #: src/Module/Moderation/Blocklist/Server/Add.php:138
#: src/Module/Moderation/Blocklist/Server/Index.php:83 #: src/Module/Moderation/Blocklist/Server/Import.php:129
#: src/Module/Moderation/Blocklist/Server/Index.php:84 #: src/Module/Moderation/Blocklist/Server/Index.php:86
#: src/Module/Moderation/Blocklist/Server/Index.php:112 #: src/Module/Moderation/Blocklist/Server/Index.php:87
#: src/Module/Moderation/Blocklist/Server/Index.php:113 #: src/Module/Moderation/Blocklist/Server/Index.php:115
#: src/Module/Moderation/Blocklist/Server/Index.php:116
#: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148 #: src/Module/Moderation/Item/Delete.php:67 src/Module/Register.php:148
#: src/Module/Security/TwoFactor/Verify.php:101 #: src/Module/Security/TwoFactor/Verify.php:101
#: src/Module/Settings/TwoFactor/Index.php:140 #: src/Module/Settings/TwoFactor/Index.php:140
@ -5589,15 +5588,15 @@ msgstr ""
msgid "Basic" msgid "Basic"
msgstr "" msgstr ""
#: src/Module/Calendar/Export.php:77 #: src/Module/Calendar/Export.php:94
msgid "This calendar format is not supported" msgid "This calendar format is not supported"
msgstr "" msgstr ""
#: src/Module/Calendar/Export.php:79 #: src/Module/Calendar/Export.php:96
msgid "No exportable data found" msgid "No exportable data found"
msgstr "" msgstr ""
#: src/Module/Calendar/Export.php:96 #: src/Module/Calendar/Export.php:113
msgid "calendar" msgid "calendar"
msgstr "" msgstr ""
@ -6725,8 +6724,8 @@ msgid "On this server the following remote servers are blocked."
msgstr "" msgstr ""
#: src/Module/Friendica.php:84 #: src/Module/Friendica.php:84
#: src/Module/Moderation/Blocklist/Server/Index.php:84 #: src/Module/Moderation/Blocklist/Server/Index.php:87
#: src/Module/Moderation/Blocklist/Server/Index.php:108 #: src/Module/Moderation/Blocklist/Server/Index.php:111
msgid "Reason for the block" msgid "Reason for the block"
msgstr "" msgstr ""
@ -7399,32 +7398,32 @@ msgid ""
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Contact.php:135 #: src/Module/Moderation/Blocklist/Contact.php:135
#: src/Module/Moderation/Blocklist/Server/Import.php:121 #: src/Module/Moderation/Blocklist/Server/Import.php:124
msgid "Block Reason" msgid "Block Reason"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:78 #: src/Module/Moderation/Blocklist/Server/Add.php:80
msgid "Server domain pattern added to the blocklist." msgid "Server domain pattern added to the blocklist."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:86 #: src/Module/Moderation/Blocklist/Server/Add.php:88
#, php-format #, php-format
msgid "%s server scheduled to be purged." msgid "%s server scheduled to be purged."
msgid_plural "%s servers scheduled to be purged." msgid_plural "%s servers scheduled to be purged."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Moderation/Blocklist/Server/Add.php:118 #: src/Module/Moderation/Blocklist/Server/Add.php:120
#: src/Module/Moderation/Blocklist/Server/Import.php:114 #: src/Module/Moderation/Blocklist/Server/Import.php:117
msgid "← Return to the list" msgid "← Return to the list"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:120 #: src/Module/Moderation/Blocklist/Server/Add.php:122
msgid "Block A New Server Domain Pattern" msgid "Block A New Server Domain Pattern"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:121 #: src/Module/Moderation/Blocklist/Server/Add.php:123
#: src/Module/Moderation/Blocklist/Server/Index.php:96 #: src/Module/Moderation/Blocklist/Server/Index.php:99
msgid "" msgid ""
"<p>The server domain pattern syntax is case-insensitive shell wildcard, " "<p>The server domain pattern syntax is case-insensitive shell wildcard, "
"comprising the following special characters:</p>\n" "comprising the following special characters:</p>\n"
@ -7434,55 +7433,55 @@ msgid ""
"</ul>" "</ul>"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:126 #: src/Module/Moderation/Blocklist/Server/Add.php:128
#: src/Module/Moderation/Blocklist/Server/Index.php:104 #: src/Module/Moderation/Blocklist/Server/Index.php:107
msgid "Check pattern" msgid "Check pattern"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:127 #: src/Module/Moderation/Blocklist/Server/Add.php:129
msgid "Matching known servers" msgid "Matching known servers"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:128 #: src/Module/Moderation/Blocklist/Server/Add.php:130
msgid "Server Name" msgid "Server Name"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:129 #: src/Module/Moderation/Blocklist/Server/Add.php:131
msgid "Server Domain" msgid "Server Domain"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:130 #: src/Module/Moderation/Blocklist/Server/Add.php:132
msgid "Known Contacts" msgid "Known Contacts"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:131 #: src/Module/Moderation/Blocklist/Server/Add.php:133
#, php-format #, php-format
msgid "%d known server" msgid "%d known server"
msgid_plural "%d known servers" msgid_plural "%d known servers"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Moderation/Blocklist/Server/Add.php:132 #: src/Module/Moderation/Blocklist/Server/Add.php:134
msgid "Add pattern to the blocklist" msgid "Add pattern to the blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:134 #: src/Module/Moderation/Blocklist/Server/Add.php:136
#: src/Module/Moderation/Blocklist/Server/Index.php:113 #: src/Module/Moderation/Blocklist/Server/Index.php:116
msgid "Server Domain Pattern" msgid "Server Domain Pattern"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:134 #: src/Module/Moderation/Blocklist/Server/Add.php:136
#: src/Module/Moderation/Blocklist/Server/Index.php:113 #: src/Module/Moderation/Blocklist/Server/Index.php:116
msgid "" msgid ""
"The domain pattern of the new server to add to the blocklist. Do not include " "The domain pattern of the new server to add to the blocklist. Do not include "
"the protocol." "the protocol."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:135 #: src/Module/Moderation/Blocklist/Server/Add.php:137
msgid "Purge server" msgid "Purge server"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:135 #: src/Module/Moderation/Blocklist/Server/Add.php:137
msgid "" msgid ""
"Also purges all the locally stored content authored by the known contacts " "Also purges all the locally stored content authored by the known contacts "
"registered on that server. Keeps the contacts and the server records. This " "registered on that server. Keeps the contacts and the server records. This "
@ -7494,149 +7493,149 @@ msgid_plural ""
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Moderation/Blocklist/Server/Add.php:136 #: src/Module/Moderation/Blocklist/Server/Add.php:138
msgid "Block reason" msgid "Block reason"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Add.php:136 #: src/Module/Moderation/Blocklist/Server/Add.php:138
msgid "" msgid ""
"The reason why you blocked this server domain pattern. This reason will be " "The reason why you blocked this server domain pattern. This reason will be "
"shown publicly in the server information page." "shown publicly in the server information page."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:73 #: src/Module/Moderation/Blocklist/Server/Import.php:74
#: src/Module/Moderation/Blocklist/Server/Import.php:82 #: src/Module/Moderation/Blocklist/Server/Import.php:83
msgid "Error importing pattern file" msgid "Error importing pattern file"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:88 #: src/Module/Moderation/Blocklist/Server/Import.php:89
msgid "Local blocklist replaced with the provided file." msgid "Local blocklist replaced with the provided file."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:92 #: src/Module/Moderation/Blocklist/Server/Import.php:93
#, php-format #, php-format
msgid "%d pattern was added to the local blocklist." msgid "%d pattern was added to the local blocklist."
msgid_plural "%d patterns were added to the local blocklist." msgid_plural "%d patterns were added to the local blocklist."
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Moderation/Blocklist/Server/Import.php:94 #: src/Module/Moderation/Blocklist/Server/Import.php:95
msgid "No pattern was added to the local blocklist." msgid "No pattern was added to the local blocklist."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:116 #: src/Module/Moderation/Blocklist/Server/Import.php:119
msgid "Import a Server Domain Pattern Blocklist" msgid "Import a Server Domain Pattern Blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:117 #: src/Module/Moderation/Blocklist/Server/Import.php:120
msgid "" msgid ""
"<p>This file can be downloaded from the <code>/friendica</code> path of any " "<p>This file can be downloaded from the <code>/friendica</code> path of any "
"Friendica server.</p>" "Friendica server.</p>"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:118 #: src/Module/Moderation/Blocklist/Server/Import.php:121
#: src/Module/Moderation/Blocklist/Server/Index.php:103 #: src/Module/Moderation/Blocklist/Server/Index.php:106
msgid "Upload file" msgid "Upload file"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:119 #: src/Module/Moderation/Blocklist/Server/Import.php:122
msgid "Patterns to import" msgid "Patterns to import"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:120 #: src/Module/Moderation/Blocklist/Server/Import.php:123
msgid "Domain Pattern" msgid "Domain Pattern"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:122 #: src/Module/Moderation/Blocklist/Server/Import.php:125
msgid "Import Mode" msgid "Import Mode"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:123 #: src/Module/Moderation/Blocklist/Server/Import.php:126
msgid "Import Patterns" msgid "Import Patterns"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:124 #: src/Module/Moderation/Blocklist/Server/Import.php:127
#, php-format #, php-format
msgid "%d total pattern" msgid "%d total pattern"
msgid_plural "%d total patterns" msgid_plural "%d total patterns"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: src/Module/Moderation/Blocklist/Server/Import.php:126 #: src/Module/Moderation/Blocklist/Server/Import.php:129
#: src/Module/Moderation/Blocklist/Server/Index.php:112 #: src/Module/Moderation/Blocklist/Server/Index.php:115
msgid "Server domain pattern blocklist CSV file" msgid "Server domain pattern blocklist CSV file"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:127 #: src/Module/Moderation/Blocklist/Server/Import.php:130
msgid "Append" msgid "Append"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:127 #: src/Module/Moderation/Blocklist/Server/Import.php:130
msgid "" msgid ""
"Imports patterns from the file that weren't already existing in the current " "Imports patterns from the file that weren't already existing in the current "
"blocklist." "blocklist."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:128 #: src/Module/Moderation/Blocklist/Server/Import.php:131
msgid "Replace" msgid "Replace"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Import.php:128 #: src/Module/Moderation/Blocklist/Server/Import.php:131
msgid "Replaces the current blocklist by the imported patterns." msgid "Replaces the current blocklist by the imported patterns."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:83 #: src/Module/Moderation/Blocklist/Server/Index.php:86
#: src/Module/Moderation/Blocklist/Server/Index.php:107 #: src/Module/Moderation/Blocklist/Server/Index.php:110
msgid "Blocked server domain pattern" msgid "Blocked server domain pattern"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:85 #: src/Module/Moderation/Blocklist/Server/Index.php:88
msgid "Delete server domain pattern" msgid "Delete server domain pattern"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:85 #: src/Module/Moderation/Blocklist/Server/Index.php:88
msgid "Check to delete this entry from the blocklist" msgid "Check to delete this entry from the blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:93 #: src/Module/Moderation/Blocklist/Server/Index.php:96
msgid "Server Domain Pattern Blocklist" msgid "Server Domain Pattern Blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:94 #: src/Module/Moderation/Blocklist/Server/Index.php:97
msgid "" msgid ""
"This page can be used to define a blocklist of server domain patterns from " "This page can be used to define a blocklist of server domain patterns from "
"the federated network that are not allowed to interact with your node. For " "the federated network that are not allowed to interact with your node. For "
"each domain pattern you should also provide the reason why you block it." "each domain pattern you should also provide the reason why you block it."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:95 #: src/Module/Moderation/Blocklist/Server/Index.php:98
msgid "" msgid ""
"The list of blocked server domain patterns will be made publically available " "The list of blocked server domain patterns will be made publically available "
"on the <a href=\"/friendica\">/friendica</a> page so that your users and " "on the <a href=\"/friendica\">/friendica</a> page so that your users and "
"people investigating communication problems can find the reason easily." "people investigating communication problems can find the reason easily."
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:101 #: src/Module/Moderation/Blocklist/Server/Index.php:104
msgid "Import server domain pattern blocklist" msgid "Import server domain pattern blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:102 #: src/Module/Moderation/Blocklist/Server/Index.php:105
msgid "Add new entry to the blocklist" msgid "Add new entry to the blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:105 #: src/Module/Moderation/Blocklist/Server/Index.php:108
msgid "Save changes to the blocklist" msgid "Save changes to the blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:106 #: src/Module/Moderation/Blocklist/Server/Index.php:109
msgid "Current Entries in the Blocklist" msgid "Current Entries in the Blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:109 #: src/Module/Moderation/Blocklist/Server/Index.php:112
msgid "Delete entry from the blocklist" msgid "Delete entry from the blocklist"
msgstr "" msgstr ""
#: src/Module/Moderation/Blocklist/Server/Index.php:110 #: src/Module/Moderation/Blocklist/Server/Index.php:113
msgid "Delete entry from the blocklist?" msgid "Delete entry from the blocklist?"
msgstr "" msgstr ""
@ -8071,7 +8070,7 @@ msgstr ""
msgid "Unsupported or missing response type" msgid "Unsupported or missing response type"
msgstr "" msgstr ""
#: src/Module/OAuth/Authorize.php:59 src/Module/OAuth/Token.php:73 #: src/Module/OAuth/Authorize.php:59 src/Module/OAuth/Token.php:76
msgid "Incomplete request data" msgid "Incomplete request data"
msgstr "" msgstr ""
@ -8082,11 +8081,11 @@ msgid ""
"close this window: %s" "close this window: %s"
msgstr "" msgstr ""
#: src/Module/OAuth/Token.php:78 #: src/Module/OAuth/Token.php:81
msgid "Invalid data or unknown client" msgid "Invalid data or unknown client"
msgstr "" msgstr ""
#: src/Module/OAuth/Token.php:97 #: src/Module/OAuth/Token.php:100
msgid "Unsupported or missing grant type" msgid "Unsupported or missing grant type"
msgstr "" msgstr ""
@ -8767,7 +8766,7 @@ msgstr ""
#: src/Module/Settings/Account.php:552 #: src/Module/Settings/Account.php:552
msgid "" msgid ""
"Allowed characters are a-z, A-Z, 0-9 and special characters except white " "Allowed characters are a-z, A-Z, 0-9 and special characters except white "
"spaces, accentuated letters and colon (:)." "spaces and accentuated letters."
msgstr "" msgstr ""
#: src/Module/Security/PasswordTooLong.php:101 #: src/Module/Security/PasswordTooLong.php:101