Merge pull request #136 from systeminc/development

Development

Author: maki10

src/Http/Controllers/AdminController.php

@@ -100,7 +100,7 @@ public function anyUploadTinyImage(Request $request)
 
         foreach ($request->file('files') as $file) {
             if ($file->isValid() && in_array($file->getClientOriginalExtension(), $allowed) && strpos($directory, 'images/tiny') !== false) {
-                $original = $file->getClientOriginalName();
+                $original = $this->cleanSpecialChars($file->getClientOriginalName());
 
                 $original_image = Image::make($file)->encode();
 

src/Http/Controllers/GalleriesController.php

@@ -336,7 +336,7 @@ private function uploadImages($images, $gallery_id, $image_id = false)
     private function handleFileElement($file)
     {
         if ($file && $file->isValid()) {
-            $dirname = 'elements/'.$file->getClientOriginalName();
+            $dirname = 'elements/'.$this->cleanSpecialChars($file->getClientOriginalName());
 
             Storage::put('public/'.$dirname, file_get_contents($file));
 

src/Http/Controllers/PagesController.php

@@ -316,7 +316,7 @@ private function checkIfIsChangedElementPrefixAndUpdatePrefix($elements_prefix,
     private function handleFileElement($file, $elements_prefix)
     {
         if ($file && $file->isValid()) {
-            $dirname = 'pages/'.$elements_prefix.'/'.$file->getClientOriginalName();
+            $dirname = 'pages/'.$elements_prefix.'/'.$this->cleanSpecialChars($file->getClientOriginalName());
 
             Storage::put('public/'.$dirname, file_get_contents($file));
 

src/Traits/HelpersTrait.php

@@ -175,4 +175,53 @@ public function consoleSignature()
         $this->line(' __________________________________________________________________________________________________ ');
         $this->line('');
     }
+
+    public function cleanSpecialChars($string)
+    {
+        $dict = [
+            "I'm"      => 'I am',
+            'thier'    => 'their',
+        ];
+
+        return strtolower(
+            preg_replace(
+                ['#[\\s-]+#', '#[^A-Za-z0-9\. -]+#'],
+                ['-', ''],
+                // the full cleanString() can be download from http://www.unexpectedit.com/php/php-clean-string-of-utf8-chars-convert-to-similar-ascii-char
+                $this->cleanString(
+                  str_replace(// preg_replace to support more complicated replacements
+                      array_keys($dict),
+                      array_values($dict),
+                      urldecode($string)
+                  )
+                )
+            )
+        );
+    }
+
+    private function cleanString($text)
+    {
+        $utf8 = [
+            '/[áàâãªä]/u'   => 'a',
+            '/[ÁÀÂÃÄ]/u'    => 'A',
+            '/[ÍÌÎÏ]/u'     => 'I',
+            '/[íìîï]/u'     => 'i',
+            '/[éèêë]/u'     => 'e',
+            '/[ÉÈÊË]/u'     => 'E',
+            '/[óòôõºö]/u'   => 'o',
+            '/[ÓÒÔÕÖ]/u'    => 'O',
+            '/[úùûü]/u'     => 'u',
+            '/[ÚÙÛÜ]/u'     => 'U',
+            '/ç/'           => 'c',
+            '/Ç/'           => 'C',
+            '/ñ/'           => 'n',
+            '/Ñ/'           => 'N',
+            '/–/'           => '-', // UTF-8 hyphen to "normal" hyphen
+            '/[’‘‹›‚]/u'    => ' ', // Literally a single quote
+            '/[“”«»„]/u'    => ' ', // Double quote
+            '/ /'           => ' ', // nonbreaking space (equiv. to 0x160)
+        ];
+
+        return preg_replace(array_keys($utf8), array_values($utf8), $text);
+    }
 }