From 8f19c5ecab7058702882aa3db4d3202ca697cb70 Mon Sep 17 00:00:00 2001 From: infoneo Date: Sun, 12 May 2013 01:47:48 +0200 Subject: [PATCH 1/4] Dots in a filenames fix --- lib/files/mapper.php | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index 15f5f0628b..97a2bff915 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -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(); From be4eef682ae515fd542ec351eef05cc54fe3247c Mon Sep 17 00:00:00 2001 From: infoneo Date: Sun, 12 May 2013 15:22:57 +0300 Subject: [PATCH 2/4] Fixed problems with a dots in a filenames --- lib/files/mapper.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index 97a2bff915..d9e116bf25 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -176,16 +176,22 @@ class Mapper $last= end($pathElements); $parts = pathinfo($last); - if ((preg_match('~[-\w]+~', $parts['filename'])) && (preg_match('~[-\w]+~', $parts['extension']))){ + $filename = $parts['filename']; + $extension = $parts['extension']; + - // rip off the extension ext from last element - $filename = $parts['filename']; - array_pop($pathElements); - array_push($pathElements, $filename); + if ((preg_match('~[-\w]+~', $filename)) && (preg_match('~[-\w]+~', $extension))){ + + // rip off the extension ext from last element + array_pop($pathElements); + array_push($pathElements, $filename); } else { - unset($parts['extension']); + if (isset($parts['extension'])) { + unset($parts['extension']); + } + } foreach ($pathElements as $pathElement) { From b39113ae3ea59db7058fe829fc0a5e4dfd49bac6 Mon Sep 17 00:00:00 2001 From: infoneo Date: Sat, 8 Jun 2013 18:39:25 +0300 Subject: [PATCH 3/4] Update mapper.php Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed). --- lib/files/mapper.php | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/lib/files/mapper.php b/lib/files/mapper.php index d9e116bf25..748b65dc4f 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -174,26 +174,7 @@ class Mapper $sluggedElements = array(); $last= end($pathElements); - $parts = pathinfo($last); - $filename = $parts['filename']; - $extension = $parts['extension']; - - - if ((preg_match('~[-\w]+~', $filename)) && (preg_match('~[-\w]+~', $extension))){ - - // rip off the extension ext from last element - array_pop($pathElements); - array_push($pathElements, $filename); - - } else { - - if (isset($parts['extension'])) { - unset($parts['extension']); - } - - } - foreach ($pathElements as $pathElement) { // remove empty elements if (empty($pathElement)) { @@ -206,13 +187,15 @@ class Mapper // apply index to file name if ($index !== null) { $last= array_pop($sluggedElements); - array_push($sluggedElements, $last.'-'.$index); - } + + // if filename contains periods - add index number before last period + if (preg_match('~\.[^\.]+$~i',$last,$extension)){ + array_push($sluggedElements, substr($last,0,-(strlen($extension[0]))).'-'.$index.$extension[0]); + } else { + // if filename doesn't contain periods add index ofter the last char + array_push($sluggedElements, $last.'-'.$index); + } - // add back the extension - if (isset($parts['extension'])) { - $last= array_pop($sluggedElements); - array_push($sluggedElements, $last.'.'.$parts['extension']); } $sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements); From 199207253e2b02808809b79ef1aa27e050b0aff1 Mon Sep 17 00:00:00 2001 From: infoneo Date: Sat, 8 Jun 2013 19:44:58 +0300 Subject: [PATCH 4/4] Update mapper.php --- tests/lib/files/mapper.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php index e3859bc0f2..48ae95b7e7 100644 --- a/tests/lib/files/mapper.php +++ b/tests/lib/files/mapper.php @@ -45,8 +45,20 @@ class Mapper extends \PHPUnit_Framework_TestCase { $this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text')); // with double dot - $this->assertEquals('D:/text-text.txt', $this->mapper->slugifyPath('D:/text.text.txt')); - $this->assertEquals('D:/text-text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2)); - $this->assertEquals('D:/a/b/text-text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt')); + $this->assertEquals('D:/text.text.txt', $this->mapper->slugifyPath('D:/text.text.txt')); + $this->assertEquals('D:/text.text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2)); + $this->assertEquals('D:/a/b/text.text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt')); + + // foldername and filename with periods + $this->assertEquals('D:/folder.name.with.periods', $this->mapper->slugifyPath('D:/folder.name.with.periods')); + $this->assertEquals('D:/folder.name.with.periods/test-2.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt', 2)); + $this->assertEquals('D:/folder.name.with.periods/test.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt')); + + // foldername and filename with periods and spaces + $this->assertEquals('D:/folder.name.with.peri-ods', $this->mapper->slugifyPath('D:/folder.name.with.peri ods')); + $this->assertEquals('D:/folder.name.with.peri-ods/te-st-2.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t', 2)); + $this->assertEquals('D:/folder.name.with.peri-ods/te-st.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t')); + + } }