From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 14 Oct 2018 10:22:06 +0000 (+0200)
Subject: Broaden allowed characters in media provider name
X-Git-Tag: 5.2.0_Alpha_1~635
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f80d446b1f0d66ce09e630b70eb2b65f917fb3ff;p=GitHub%2FWoltLab%2FWCF.git

Broaden allowed characters in media provider name

See #2545
---

diff --git a/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
index 5860f40605..b6cfab01dd 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/MediaProviderPackageInstallationPlugin.class.php
@@ -116,7 +116,7 @@ class MediaProviderPackageInstallationPlugin extends AbstractXMLPackageInstallat
 				->label('wcf.acp.pip.mediaProvider.name')
 				->description('wcf.acp.pip.mediaProvider.name.description')
 				->addValidator(new FormFieldValidator('format', function(TextFormField $formField) {
-					if (!preg_match('~^[a-z][A-z]+$~', $formField->getSaveValue())) {
+					if (!preg_match('~^[a-z][A-z0-9-]+$~', $formField->getSaveValue())) {
 						$formField->addValidationError(
 							new FormFieldValidationError(
 								'format',
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 4e5f47ce97..f562cfa949 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1941,7 +1941,7 @@ If you have <strong>already bought the licenses for the listed apps</strong>, th
 		<item name="wcf.acp.pip.acpSearchProvider.showOrder"><![CDATA[Position]]></item>
 		<item name="wcf.acp.pip.acpSearchProvider.showOrder.description"><![CDATA[The entered value determines in which order the different types of search results are shown.]]></item>
 		<item name="wcf.acp.pip.mediaProvider.name"><![CDATA[Provider Name]]></item>
-		<item name="wcf.acp.pip.mediaProvider.name.description"><![CDATA[The name of the media provider may only contain letters and must begin with a lowercase letter.]]></item>
+		<item name="wcf.acp.pip.mediaProvider.name.description"><![CDATA[The name of the media provider may only contain letters, numbers and dashes and must begin with a lowercase letter.]]></item>
 		<item name="wcf.acp.pip.mediaProvider.name.error.format"><![CDATA[The entered name is invalid.]]></item>
 		<item name="wcf.acp.pip.mediaProvider.regex"><![CDATA[Regular Expressions]]></item>
 		<item name="wcf.acp.pip.mediaProvider.regex.description"><![CDATA[The entered regular expressions (without delimiters) are used to check if this media provider is responsible for a given link. Each line is treated as its own regular expression.]]></item>