Updates to regex per feedback

concretecms · Aug 5, 2021 · fd6ec76 · fd6ec76
1 parent 73d652c
commit fd6ec76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/concrete/blocks/external_form/controller.php b/concrete/blocks/external_form/controller.php
@@ -78,7 +78,7 @@ public function validate($args)
                 $filenameToCheck = $filename; // We just check the entirety of what's passed in.
             }
 
-            if (preg_match('/[^A-Za-z0-9_-]/i', $filenameToCheck)) {
+            if (!preg_match('/^[A-Za-z0-9_-]+$/i', $filenameToCheck)) {
                 $e->add(
                     t('External forms may only contain letters, numbers, dashes and underscores.')
                 );

diff --git a/concrete/src/Block/Block.php b/concrete/src/Block/Block.php
@@ -1534,7 +1534,7 @@ public function updateBlockInformation($data)
                     $bFilenameToCheck = $bFilename; // We just check the entirety of what's passed in.
                 }
 
-                if (preg_match('/[^A-Za-z0-9_-]/i', $bFilenameToCheck)) {
+                if (!preg_match('/^[A-Za-z0-9_-]+$/i', $bFilenameToCheck)) {
                     $bFilename = null;
                     throw new \RuntimeException(
                         t('Custom templates may only contain letters, numbers, dashes and underscores.')