Changeset 23592

Timestamp:

Jun 27, 2013, 4:16:10 PM (11 years ago)

Author:

plg

Message:

clean spaces and dashes as well as underscores in filenames (see r23591)

File:

• extensions/download_by_size/main.inc.php (modified) (1 diff)

extensions/download_by_size/main.inc.php

@@ -85 +85 @@
   $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, $conf['download_by_size_file_pattern']);
-  $filename = preg_replace(array('#_+#', '#^_#', '#_$#'), array('_', null, null), $filename);
-
+  $filename = preg_replace(
+    array('#_+#', '#-+#', '# +#', '#^([_\- ]+)#', '#([_\- ]+)$#'),
+    array('_', '-', ' ', null, null),
+    $filename
+    );
+  
   if (empty($filename) || $filename == $conf['download_by_size_file_pattern'])
   {