Index: webform2pdf.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform2pdf/webform2pdf.module,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 webform2pdf.module
--- webform2pdf.module	17 Aug 2010 19:10:17 -0000	1.2.2.2
+++ webform2pdf.module	10 Sep 2010 09:12:12 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: webform2pdf.module,v 1.2.2.2 2010/08/17 19:10:17 york Exp $
+// $Id: webform2pdf.module,v 1.1.2.13 2010/05/20 12:54:58 york Exp $
 
 /**
  * This menu appears only if 'Generate PDF' option is enabled
@@ -106,6 +106,9 @@ function webform2pdf_theme() {
     'webform2pdf_mail2pdf' => array(
       'arguments' => array('nid' => NULL, 'sid' => NULL),
     ),
+    'webform2pdf_filename' => array(
+      'arguments' => array('node' => NULL, 'submission' => NULL),
+    ),
   );
 } // function webform2pdf_theme()
 
 
@@ -1470,6 +1474,10 @@ function _webform2pdf_get_submissions($n
   return $submissions;
 } // function _webform2pdf_get_submissions()
 
+function theme_webform2pdf_filename($node, $submission) {
+  return "webform_submission-". $node->nid .'-'. $submission->sid .".pdf";
+}
+
 /*
  * _webform2pdf_download_pdf_form: Creates a form, where the submissions can be downloaded in PDF format
  */
@@ -1800,7 +1808,7 @@ function webform2pdf_submission_download
       // reset pointer to the last page
       $pdf->lastPage();
 
-      $filename = "webform_submission-". $node->nid .'-'. $submission->sid .".pdf";
+      $filename = theme('webform2pdf_filename', $node, $submission);
 
       if ( $output_type == 'S') {
         return $pdf->Output($filename, $output_type);
@@ -1845,10 +1853,15 @@ function webform2pdf_mail_alter(&$messag
       $message['body'] = $body;
       unset($body);
 
+      $node = node_load($webform2pdf_send2pdf['nid']);
+      $submission = webform_menu_submission_load($webform2pdf_send2pdf['sid'], $nid) ;
+      $filename = $filename = theme('webform2pdf_filename', $node, $submission);
+      unset($node, $submission);
+
       $message['body'] .= "\n\n--". $trenner ."\n";
-      $message['body'] .= "Content-Type: application/pdf; name=\"webform_submission-". $webform2pdf_send2pdf['nid'] .'-'. $webform2pdf_send2pdf['sid'] .".pdf\"\n";
+      $message['body'] .= "Content-Type: application/pdf; name=\"". $filename ."\"n";
       $message['body'] .= "Content-Transfer-Encoding: base64\n";
-      $message['body'] .= "Content-Disposition: attachment; filename=\"webform_submission-". $webform2pdf_send2pdf['nid'] .'-'. $webform2pdf_send2pdf['sid'] .".pdf\"\n\n";
+      $message['body'] .= "Content-Disposition: attachment; filename=\"". $filename ."\"\n\n";
       $message['body'] .= chunk_split( base64_encode( theme('webform2pdf_mail2pdf', $webform2pdf_send2pdf['nid'], $webform2pdf_send2pdf['sid']) ) );
       $message['body'] .= "\n\n";
       $message['body'] .= "--". $trenner ."--";