summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2002-02-23 10:22:16 +0000
committerfukachan <fukachan>2002-02-23 10:22:16 +0000
commit02d0774808609d69427fc601dae4a9fa27e127bf (patch)
tree673468e36a0fd03377d734f3084bb373f7da33b7
parenta0df002a28bf4f95b35fadea3f6473cc0f675964 (diff)
downloadfml8-02d0774808609d69427fc601dae4a9fa27e127bf.tar.gz
fml8-02d0774808609d69427fc601dae4a9fa27e127bf.tar.bz2
fml8-02d0774808609d69427fc601dae4a9fa27e127bf.zip
fix filename= in mime header
-rw-r--r--fml/lib/FML/Command/Admin/get.pm10
-rw-r--r--fml/lib/FML/Command/SendFile.pm7
2 files changed, 9 insertions, 8 deletions
diff --git a/fml/lib/FML/Command/Admin/get.pm b/fml/lib/FML/Command/Admin/get.pm
index 8da03d98..56d43348 100644
--- a/fml/lib/FML/Command/Admin/get.pm
+++ b/fml/lib/FML/Command/Admin/get.pm
@@ -4,7 +4,7 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: get.pm,v 1.9 2002/02/20 14:10:37 fukachan Exp $
+# $FML: get.pm,v 1.10 2002/02/23 10:04:03 fukachan Exp $
#
package FML::Command::Admin::get;
@@ -76,12 +76,12 @@ sub process
use File::Spec;
my $file = File::Spec->catfile($ml_home_dir, $f);
- Log("send back $file"); # XXX but return to whom ?
-
if (-f $file) {
- Log("send back $file");
- $command_args->{ _file_to_send } = $file;
+ Log("send back $f");
+ $command_args->{ _filename_to_send } = $f;
+ $command_args->{ _file_to_send } = $file;
$self->send_file($curproc, $command_args);
+ delete $command_args->{ _filename_to_send };
delete $command_args->{ _file_to_send };
}
else {
diff --git a/fml/lib/FML/Command/SendFile.pm b/fml/lib/FML/Command/SendFile.pm
index 8bed8524..dfd601d5 100644
--- a/fml/lib/FML/Command/SendFile.pm
+++ b/fml/lib/FML/Command/SendFile.pm
@@ -4,7 +4,7 @@
# All rights reserved. This program is free software; you can
# redistribute it and/or modify it under the same terms as Perl itself.
#
-# $FML: SendFile.pm,v 1.11 2002/02/13 11:13:14 fukachan Exp $
+# $FML: SendFile.pm,v 1.12 2002/02/17 03:13:48 fukachan Exp $
#
package FML::Command::SendFile;
@@ -173,6 +173,7 @@ send back file specified as C<$command_args->{ _file_to_send }>.
sub send_file
{
my ($self, $curproc, $command_args) = @_;
+ my $file_name = $command_args->{ _filename_to_send };
my $what_file = $command_args->{ _file_to_send };
my $config = $curproc->{ config };
my $charset = $config->{ reply_message_charset };
@@ -188,8 +189,8 @@ sub send_file
$curproc->reply_message( {
type => "text/plain; charset=$charset",
path => $xxxx_template,
- filename => "help",
- disposition => "help",
+ filename => $file_name,
+ disposition => $file_name,
});
}
else {