Changeset 23591

Timestamp:

Jun 27, 2013, 3:53:23 PM (11 years ago)

Author:

mistic100

Message:

clean spaces and dashes as well as underscores in filenames

File:

• extensions/BatchDownloader/include/BatchDownloader.class.php (modified) (1 diff)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -406 +406 @@
     $replace = array($row['id'], $row['filename']);
     
-    if (!empty($row['author'])) $replace[] = $row['author'];
-                           else $replace[] = null;
-                           
-    if (!empty($filesize)) $replace[] = $filesize['width'].'x'.$filesize['height'];
-                      else $replace[] = null;
-                      
+    $replace[2] = empty($row['author']) ? null : $row['author'];
+    $replace[3] = empty($filesize) ? null : $filesize['width'].'x'.$filesize['height'];
+    
     $filename = str_replace($search, $replace, $this->conf['file_pattern']);
-    $filename = preg_replace(array('#_+#', '#^_#', '#_$#'), array('_', null, null), $filename);
+    $filename = preg_replace(
+      array('#_+#', '#-+#', '# +#', '#^([_\- ]+)#', '#([_\- ]+)$#'),
+      array('_', '-', ' ', null, null),
+      $filename
+      );
     
     if (empty($filename) || $filename == $this->conf['file_pattern'])