Merge pull request #100 from cloudinary/fix/CLOUD-433

David Cramer · web-flow · commit 0c6b0b46bc8e · 2020-06-08T13:44:58.000+02:00
update regex to include dashes as provided
diff --git a/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php b/cloudinary-image-management-and-manipulation-in-the-cloud-cdn/php/class-connect.php
@@ -157,7 +157,7 @@ public function verify_connection( $data ) {
 		}
 
 		// Pattern match to ensure validity of the provided url
-		if ( ! preg_match( '~^(?:CLOUDINARY_URL=)?cloudinary://[0-9]+:[A-Za-z_0-9]+@[A-Za-z]+~', $data['cloudinary_url'] ) ) {
+		if ( ! preg_match( '~^(?:CLOUDINARY_URL=)?cloudinary://[0-9]+:[A-Za-z_\-0-9]+@[A-Za-z]+~', $data['cloudinary_url'] ) ) {
 			add_settings_error(
 				'cloudinary_connect',
 				'format_mismatch',

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function verify_connection( $data ) {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`// Pattern match to ensure validity of the provided url`
`160`		`- if ( ! preg_match( '~^(?:CLOUDINARY_URL=)?cloudinary://[0-9]+:[A-Za-z_0-9]+@[A-Za-z]+~', $data['cloudinary_url'] ) ) {`
	`160`	`+ if ( ! preg_match( '~^(?:CLOUDINARY_URL=)?cloudinary://[0-9]+:[A-Za-z_\-0-9]+@[A-Za-z]+~', $data['cloudinary_url'] ) ) {`
`161`	`161`	`add_settings_error(`
`162`	`162`	`'cloudinary_connect',`
`163`	`163`	`'format_mismatch',`