Commit 9c6f353d authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 'main'

Release 22-07-2021

See merge request !674
parents 95d962e1 9d95d102
Pipeline #13658 passed with stages
in 8 minutes and 1 second
This diff is collapsed.
...@@ -97,10 +97,10 @@ class ApiUser ...@@ -97,10 +97,10 @@ class ApiUser
if (!$this->userIsAlreadyLoggedIn() && !$this->ldapValidationSucceeded()) { if (!$this->userIsAlreadyLoggedIn() && !$this->ldapValidationSucceeded()) {
$this->userGroups = []; $this->userGroups = [];
$this->authenticated = false; $this->authenticated = false;
throw new UnauthorizedException('Wrong password.', ResultCodes::ERROR_GENERAL_WRONGPASSWORD); throw new UnauthorizedException('Username does not exist or password is wrong.', ResultCodes::ERROR_GENERAL_WRONGPASSWORD);
} }
} else { } else {
throw new UnauthorizedException('The specified user does not exist. You need to login first on extensions.typo3.org.', ResultCodes::ERROR_GENERAL_USERNOTFOUND); throw new UnauthorizedException('Username does not exist or password is wrong.', ResultCodes::ERROR_GENERAL_USERNOTFOUND);
} }
$this->authenticated = true; $this->authenticated = true;
......
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
<f:layout name="Default" /> <f:layout name="Default" />
<f:section name="main"> <f:section name="main">
...@@ -280,13 +280,8 @@ ...@@ -280,13 +280,8 @@
</div> </div>
</f:form> </f:form>
<div class="alert alert-info mt-3"> <div class="alert alert-info mt-3">
<h4>Please make sure that the extension key you register follows the following rules</h4> <h4>Please make sure that the extension key you register follows the rules</h4>
<ul> <p>Check the <a title="Please review the Rules for the Extension Key" target="_blank" href="https://docs.typo3.org/m/typo3/reference-coreapi/master/en-us/ExtensionArchitecture/ExtensionKey/Index.html#rules-for-the-extension-key">Rules for the Extension Key</a> at the official documentation.</p>
<li>Allowed characters are: a-z (lowercase), 0-9 and '_' (underscore)</li>
<li>The key must not begin with one of the following prefixes: tx,user_,pages,tt_,sys_,ts_language_,csh_</li>
<li>Extension keys must not start with a number and must not start or end with an '_' (underscore)</li>
<li>An extension key must have minimum 3, maximum 30 characters (not counting underscores)</li>
</ul>
</div> </div>
</div> </div>
<div class="tab-pane" id="transfer" role="tabpanel"> <div class="tab-pane" id="transfer" role="tabpanel">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment