TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix point usage in regex

Browse Source 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
This commit is contained in:
Benjamin Perche
2014-08-04 11:27:09 +02:00
parent b8a9518deb
commit 967dbc15d4
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/lib/Thelia/Controller/Admin/FileController.php
View File

@@ -110,7 +110,7 @@ class FileController extends BaseAdminController
);
}
$regex = "#(".implode("|", $validMimeTypes[$mimeType]).")$#i";
$regex = "#^(.+)\.(".implode("|", $validMimeTypes[$mimeType]).")$#i";
if (!preg_match($regex, $realFileName)) {
$message = $this->getTranslator()
@@ -125,7 +125,7 @@ class FileController extends BaseAdminController
}
if (!empty($extBlackList)) {
$regex = "#(".implode("|", $extBlackList).")$#i";
$regex = "#^(.+)\.(".implode("|", $extBlackList).")$#i";
if (preg_match($regex, $realFileName)) {
$message = $this->getTranslator()
@@ -207,9 +207,9 @@ class FileController extends BaseAdminController
$parentType,
'image',
[
'image/jpeg' => [".jpg", ".jpeg"],
'image/png' => [".png"],
'image/gif' => [".gif"],
'image/jpeg' => ["jpg", "jpeg"],
'image/png' => ["png"],
'image/gif' => ["gif"],
]
);
}
@@ -230,13 +230,13 @@ class FileController extends BaseAdminController
'document',
[],
[
".php",
".php3",
".php4",
".php5",
".php6",
".asp",
".aspx",
"php",
"php3",
"php4",
"php5",
"php6",
"asp",
"aspx",
]
);
}