summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2006-03-18 02:28:33 +0000
committerfukachan <fukachan>2006-03-18 02:28:33 +0000
commitacaf309cc3e754ac7649ebb046c7528e8ffcd4f6 (patch)
tree41fd26e46fd72d391d8dc62b5613ac7de7feca7c
parenta2c4bca214cd76a3ef8e79b962aabc3d2d725638 (diff)
downloadfml8-acaf309cc3e754ac7649ebb046c7528e8ffcd4f6.tar.gz
fml8-acaf309cc3e754ac7649ebb046c7528e8ffcd4f6.tar.bz2
fml8-acaf309cc3e754ac7649ebb046c7528e8ffcd4f6.zip
List-Software/X-MLServer: ${mail_header_default_list_software} or
${article_header_list_software} by definition. sort definition order: _get_header_type(), ...
-rw-r--r--fml/lib/FML/Header.pm53
1 files changed, 27 insertions, 26 deletions
diff --git a/fml/lib/FML/Header.pm b/fml/lib/FML/Header.pm
index 4b3947b1..60f797a9 100644
--- a/fml/lib/FML/Header.pm
+++ b/fml/lib/FML/Header.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: Header.pm,v 1.89 2006/02/05 01:01:55 fukachan Exp $
+# $FML: Header.pm,v 1.90 2006/03/12 11:54:42 fukachan Exp $
#
package FML::Header;
@@ -276,31 +276,6 @@ add Message-Id field.
=cut
-# Descriptions: add "X-ML-Server: fml .." and "List-Software: fml .."
-# to header.
-# Arguments: OBJ($header) OBJ($config) HASH_REF($rw_args)
-# Side Effects: update $header
-# Return Value: none
-sub add_software_info
-{
- my ($header, $config, $rw_args) = @_;
- my $fml_version = $config->{ fml_version } || '';
- my $object_type = defined $rw_args->{ type } ? $rw_args->{ type } : '';
-
- if ($fml_version) {
- if ($object_type eq 'MIME::Lite') {
- my $msg = $rw_args->{ message };
- $msg->attr('X-MLServer' => $fml_version);
- $msg->attr('List-Software' => $fml_version);
- }
- else {
- $header->add('X-MLServer', $fml_version);
- $header->add('List-Software', $fml_version);
- }
- }
-}
-
-
# Descriptions: return header type.
# Arguments: OBJ($header) OBJ($config) HASH_REF($rw_args)
# Side Effects: none
@@ -319,6 +294,32 @@ sub _get_header_type
}
+# Descriptions: add "X-ML-Server: fml .." and "List-Software: fml .."
+# to header.
+# Arguments: OBJ($header) OBJ($config) HASH_REF($rw_args)
+# Side Effects: update $header
+# Return Value: none
+sub add_software_info
+{
+ my ($header, $config, $rw_args) = @_;
+ my $hdrtype = $header->_get_header_type($config, $rw_args);
+ my $software = $config->{ "${hdrtype}_list_software" } || '';
+ my $object_type = $rw_args->{ type } || '';
+
+ if ($software) {
+ if ($object_type eq 'MIME::Lite') {
+ my $msg = $rw_args->{ message };
+ $msg->attr('X-MLServer' => $software);
+ $msg->attr('List-Software' => $software);
+ }
+ else {
+ $header->add('X-MLServer', $software);
+ $header->add('List-Software', $software);
+ }
+ }
+}
+
+
# Descriptions: add List-* to header.
# Arguments: OBJ($header) OBJ($config) HASH_REF($rw_args)
# Side Effects: update $header