diff -r 8490ce0cdd8c -r ebd7003e73c6 plugins/gallery/fetcher.php
--- a/plugins/gallery/fetcher.php	Thu Jul 26 14:43:45 2007 -0400
+++ b/plugins/gallery/fetcher.php	Thu Aug 09 12:31:24 2007 -0400
@@ -50,7 +50,7 @@
     $type = 'preview';
   }
   
-  $q = $db->sql_query('SELECT img_filename, img_time_mod, is_folder FROM '.table_prefix.'gallery WHERE img_id=' . $id . ';');
+  $q = $db->sql_query('SELECT img_title, img_filename, img_time_mod, is_folder FROM '.table_prefix.'gallery WHERE img_id=' . $id . ';');
   if ( !$q )
     $db->_die();
   
@@ -64,10 +64,12 @@
     case 'thumb':
       $filename = ENANO_ROOT . '/cache/' . $row['img_filename'] . '-thumb.jpg';
       $mimetype = 'image/jpeg';
+      $ext = "jpg";
       break;
     case 'preview':
       $filename = ENANO_ROOT . '/cache/' . $row['img_filename'] . '-preview.jpg';
       $mimetype = 'image/jpeg';
+      $ext = "jpg";
       break;
     case 'full':
       $filename = ENANO_ROOT . '/files/' . $row['img_filename'];
@@ -109,8 +111,23 @@
   header('Content-length: ' . strlen($contents));
   header('Last-Modified: '  . date('r', $row['img_time_mod']));
   
+  if ( isset($_GET['download']) )
+  {
+    // determine an appropriate non-revealing filename
+    $filename = str_replace(' ', '_', $row['img_title']);
+    $filename = preg_replace('/([^\w\._-]+)/', '-', $filename);
+    $filename = trim($filename, '-');
+    $filename .= ".$ext";
+    header('Content-disposition: attachment; filename=' . $filename);
+  }
+  
   echo $contents;
   
+  gzip_output();
+  
+  $db->close();
+  exit;
+  
 }
 
 ?>