Commit 41c43bfb authored by Stefan Busemann's avatar Stefan Busemann
Browse files

Merge branch 'bugfix/add-patch-for-link-validation' into 'develop'

Add patch for email validation

See merge request !433
parents 22542ec4 adb6498a
Pipeline #11538 passed with stages
in 4 minutes and 27 seconds
{ {
"name": "t3o/typo3.org", "name": "t3o/typo3.org",
"description": "Website for TYPO3.org", "description": "Website for TYPO3.org",
"authors": [ "authors": [
{ {
"name": "t3o team", "name": "t3o team",
"email": "maintenance@typo3.org" "email": "maintenance@typo3.org"
} }
], ],
"support": { "support": {
"email": "maintenance@typo3.org", "email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/typo3.org/issues" "issues": "https://git-t3o.typo3.org/t3o/typo3.org/issues"
}, },
"repositories": [ "repositories": [
{ {
"type": "path", "type": "path",
"url": "extensions/*" "url": "extensions/*"
}, },
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/TYPO3GmbH/ext-hubspot-forms.git" "url": "https://github.com/TYPO3GmbH/ext-hubspot-forms.git"
}, },
{ {
"type": "composer", "type": "composer",
"url": "https://gitlab.typo3.org/api/v4/group/560/-/packages/composer/" "url": "https://gitlab.typo3.org/api/v4/group/560/-/packages/composer/"
} }
], ],
"require": { "require": {
"apache-solr-for-typo3/solr": "^11.0", "apache-solr-for-typo3/solr": "^11.0",
"brotkrueml/typo3-matomo-widgets": "^0.1.0", "brotkrueml/typo3-matomo-widgets": "^0.1.0",
"cweagans/composer-patches": "^1.6", "cweagans/composer-patches": "^1.6",
"derhansen/sf_event_mgt": "^5.0", "derhansen/sf_event_mgt": "^5.0",
"doctrine/dbal": "~2.10.3", "doctrine/dbal": "~2.10.3",
"georgringer/news": "^8.0", "georgringer/news": "^8.0",
"gordalina/cachetool": "^4.0", "gordalina/cachetool": "^4.0",
"reelworx/rx-shariff": "^13.0", "reelworx/rx-shariff": "^13.0",
"spooner/deployer-information": "^1.1", "spooner/deployer-information": "^1.1",
"t3g/hubspot-forms": "^1.1", "t3g/hubspot-forms": "^1.1",
"t3o/randombanners": "^2.0", "t3o/randombanners": "^2.0",
"t3o/t3o_donation": "@dev", "t3o/t3o_donation": "@dev",
"t3o/t3o_membership": "^3.0", "t3o/t3o_membership": "^3.0",
"t3o/t3o_planet": "@dev", "t3o/t3o_planet": "@dev",
"t3o/t3olayout": "^5.0", "t3o/t3olayout": "^5.0",
"t3o/t3org_layout": "@dev", "t3o/t3org_layout": "@dev",
"t3o/typo3-roadmap": "@dev", "t3o/typo3-roadmap": "@dev",
"typo3/cms-adminpanel": "^10.4", "typo3/cms-adminpanel": "^10.4",
"typo3/cms-dashboard": "^10.4", "typo3/cms-dashboard": "^10.4",
"typo3/cms-linkvalidator": "^10.4", "typo3/cms-linkvalidator": "^10.4",
"typo3/cms-redirects": "^10.4", "typo3/cms-redirects": "^10.4",
"typo3/cms-seo": "^10.4", "typo3/cms-seo": "^10.4",
"typo3/cms-sys-note": "^10.4", "typo3/cms-sys-note": "^10.4",
"typo3/cms-workspaces": "^10.4", "typo3/cms-workspaces": "^10.4",
"yoast-seo-for-typo3/yoast_seo": "^7.0" "yoast-seo-for-typo3/yoast_seo": "^7.0"
}, },
"config": { "config": {
"sort-packages": true, "sort-packages": true,
"platform": { "platform": {
"php": "7.4.4" "php": "7.4.4"
} }
}, },
"extra": { "extra": {
"typo3/cms": { "patches": {
"root-dir": "private", "typo3/cms-core": {
"web-dir": "public", "Add basic check for email before validation": "patches/email-validation.diff"
"cms-package-dir": "{$vendor-dir}/typo3/cms" }
}, },
"enable-patching": true "typo3/cms": {
}, "root-dir": "private",
"require-dev": { "web-dir": "public",
"ichhabrecht/filefill": "^3.2" "cms-package-dir": "{$vendor-dir}/typo3/cms"
} },
"enable-patching": true
},
"require-dev": {
"ichhabrecht/filefill": "^3.2"
}
} }
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "efe5c997c9852cc4f3126f7f8bdbbb7e", "content-hash": "4bd1433c5b5962f510f3fac11cf47f27",
"packages": [ "packages": [
{ {
"name": "adoy/fastcgi-client", "name": "adoy/fastcgi-client",
...@@ -7088,16 +7088,16 @@ ...@@ -7088,16 +7088,16 @@
}, },
{ {
"name": "typo3/cms-composer-installers", "name": "typo3/cms-composer-installers",
"version": "v3.1.0", "version": "v3.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/TYPO3/CmsComposerInstallers.git", "url": "https://github.com/TYPO3/CmsComposerInstallers.git",
"reference": "f307b64bd6f1309367c58cabb2fc84040b908ab5" "reference": "3092660e3cb629782b364266985b5b9b1f51f165"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/f307b64bd6f1309367c58cabb2fc84040b908ab5", "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/3092660e3cb629782b364266985b5b9b1f51f165",
"reference": "f307b64bd6f1309367c58cabb2fc84040b908ab5", "reference": "3092660e3cb629782b364266985b5b9b1f51f165",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -7113,6 +7113,7 @@ ...@@ -7113,6 +7113,7 @@
}, },
"require-dev": { "require-dev": {
"composer/composer": "1.2.*@dev || 2.0.*@dev", "composer/composer": "1.2.*@dev || 2.0.*@dev",
"friendsofphp/php-cs-fixer": "^2.18",
"overtrue/phplint": "^2.0", "overtrue/phplint": "^2.0",
"phpunit/phpunit": "^8.5" "phpunit/phpunit": "^8.5"
}, },
...@@ -7156,9 +7157,9 @@ ...@@ -7156,9 +7157,9 @@
"support": { "support": {
"general": "https://typo3.org/support/", "general": "https://typo3.org/support/",
"issues": "https://github.com/TYPO3/CmsComposerInstallers/issues", "issues": "https://github.com/TYPO3/CmsComposerInstallers/issues",
"source": "https://github.com/TYPO3/CmsComposerInstallers/tree/v3.1.0" "source": "https://github.com/TYPO3/CmsComposerInstallers/tree/v3.1.1"
}, },
"time": "2021-03-02T09:26:00+00:00" "time": "2021-03-22T12:30:09+00:00"
}, },
{ {
"name": "typo3/cms-core", "name": "typo3/cms-core",
......
--- Classes/LinkHandling/LegacyLinkNotationConverter.php 2021-03-16 11:15:49.000000000 +0100
+++ Classes/LinkHandling/NewLegacyLinkNotationConverter.php 2021-04-25 20:44:12.000000000 +0200
@@ -71,7 +71,7 @@
// Resolve FAL-api "file:UID-of-sys_file-record" and "file:combined-identifier"
if (stripos($linkParameter, 'file:') === 0) {
$result = $this->getFileOrFolderObjectFromMixedIdentifier(substr($linkParameter, 5));
- } elseif (GeneralUtility::validEmail((string)parse_url($linkParameter, PHP_URL_PATH))) {
+ } elseif (strpos($linkParameter, '@') !== false && GeneralUtility::validEmail((string)parse_url($linkParameter, PHP_URL_PATH))) {
$result['type'] = LinkService::TYPE_EMAIL;
$result['email'] = $linkParameter;
} elseif (strpos($linkParameter, 'tel:') === 0) {
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