wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Dots in a filenames fix

Browse source
This commit is contained in:
infoneo 2013-05-12 01:47:48 +02:00
parent 8a838e0e03
commit 8f19c5ecab
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/files/mapper.php
View file

@ -172,13 +172,21 @@ class Mapper
$pathElements = explode('/', $path);
$sluggedElements = array();
// rip off the extension ext from last element
$last= end($pathElements);
$parts = pathinfo($last);
$filename = $parts['filename'];
array_pop($pathElements);
array_push($pathElements, $filename);
if ((preg_match('~[-\w]+~', $parts['filename'])) && (preg_match('~[-\w]+~', $parts['extension']))){
// rip off the extension ext from last element
$filename = $parts['filename'];
array_pop($pathElements);
array_push($pathElements, $filename);
} else {
unset($parts['extension']);
}
foreach ($pathElements as $pathElement) {
// remove empty elements
@ -213,8 +221,8 @@ class Mapper
*/
private function slugify($text)
{
// replace non letter or digits by -
$text = preg_replace('~[^\\pL\d]+~u', '-', $text);
// replace non letter or digits or dots by -
$text = preg_replace('~[^\\pL\d\.]+~u', '-', $text);
// trim
$text = trim($text, '-');
@ -228,7 +236,10 @@ class Mapper
$text = strtolower($text);
// remove unwanted characters
$text = preg_replace('~[^-\w]+~', '', $text);
$text = preg_replace('~[^-\w\.]+~', '', $text);
// trim ending dots (for security reasons and win compatibility)
$text = preg_replace('~\.+$~', '', $text);
if (empty($text)) {
return uniqid();