Changeset 3357:9bbeb2691a23 for inc/core/class.dc.media.php

Timestamp:

10/06/16 15:55:18 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

3356:d298544918cd (diff), 3354:a9db771a5a70 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fixes commited on stable 2.10 branch

Files:

• inc/core/class.dc.media.php (modified) (3 diffs)
• inc/core/class.dc.media.php (modified) (2 diffs)

inc/core/class.dc.media.php

@@ -393 +393 @@
           }
 
-          $media_dir = $this->relpwd ? $this->relpwd : '.';
+          $media_dir = $this->relpwd ?: '.';
 
           $strReq =
@@ -660 +660 @@
      protected function rebuildDB($pwd)
      {
-          $media_dir = $pwd ? $pwd : '.';
+          $media_dir = $pwd ?: '.';
 
           $strReq =
@@ -919 +919 @@
      public function getDBDirs()
      {
-          $media_dir = $this->relpwd ? $this->relpwd : '.';
+          $media_dir = $this->relpwd ?: '.';
 
           $strReq =

inc/core/class.dc.media.php

@@ -943 +943 @@
           $zip = new fileUnzip($f->file);
           $zip->setExcludePattern($this->exclude_pattern);
-          $zip->getList(false,'#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
+          $list = $zip->getList(false,'#(^|/)(__MACOSX|\.svn|\.DS_Store|\.directory|Thumbs\.db)(/|$)#');
 
           if ($create_dir)
@@ -968 +968 @@
           $zip->unzipAll($target);
           $zip->close();
+
+          // Clean-up all extracted filenames
+          $clean = function ($name) {
+               $n = text::deaccent($name);
+               $n = preg_replace('/^[.]/u','',$n);
+               return preg_replace('/[^A-Za-z0-9._\-\/]/u','_',$n);
+          };
+          foreach ($list as $zk => $zv) {
+               // Check if extracted file exists
+               $zf = $target.'/'.$zk;
+               if (!$zv['is_dir'] && file_exists($zf)) {
+                    $zt = $clean($zf);
+                    if ($zt != $zf) {
+                         rename($zf,$zt);
+                    }
+               }
+          }
+
           return dirname($f->relname).'/'.$destination;
      }