implement Mail::Message::Utils::from_to_name() and modified modules to

use it.

3 files changed, 44 insertions, 39 deletions

diff --git a/fml/lib/Mail/Message/DB.pm b/fml/lib/Mail/Message/DB.pm
index 1e5c53a0..0780c504 100644
--- a/fml/lib/Mail/Message/DB.pm
+++ b/fml/lib/Mail/Message/DB.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: DB.pm,v 1.1.2.5 2003/06/04 13:37:22 fukachan Exp $
+# $FML: DB.pm,v 1.1.2.6 2003/06/14 05:39:03 fukachan Exp $
 #
 
 package Mail::Message::DB;
@@ -21,7 +21,7 @@ use lib qw(../../../../fml/lib
 	   ../../../../img/lib
 	   );
 
-my $version = q$FML: DB.pm,v 1.1.2.5 2003/06/04 13:37:22 fukachan Exp $;
+my $version = q$FML: DB.pm,v 1.1.2.6 2003/06/14 05:39:03 fukachan Exp $;
 if ($version =~ /,v\s+([\d\.]+)\s+/) { $version = $1;}
 
 my $debug = 1;
@@ -568,24 +568,9 @@ sub _address_clean_up
 sub _who_of_address
 {
     my ($self, $address) = @_;
-    my ($user);
 
-    use Mail::Address;
-    my (@addrs) = Mail::Address->parse($address);
-
-    for my $addr (@addrs) {
-	if (defined( $addr->phrase() )) {
-	    my $phrase = $self->_decode_mime_string( $addr->phrase() );
-
-	    if ($phrase) {
-		return($phrase);
-	    }
-	}
-
-	$user = $addr->user();
-    }
-
-    return( $user ? "$user\@xxx.xxx.xxx.xxx" : $address );
+    use Mail::Message::Utils;
+    return Mail::Message::Utils::from_to_name($address);
 }
 
 
diff --git a/fml/lib/Mail/Message/ToHTML.pm b/fml/lib/Mail/Message/ToHTML.pm
index 400aef90..8d114509 100644
--- a/fml/lib/Mail/Message/ToHTML.pm
+++ b/fml/lib/Mail/Message/ToHTML.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: ToHTML.pm,v 1.41.2.4 2003/06/03 13:43:49 fukachan Exp $
+# $FML: ToHTML.pm,v 1.41.2.5 2003/06/14 06:03:20 fukachan Exp $
 #
 
 package Mail::Message::ToHTML;
@@ -17,7 +17,7 @@ my $debug = 1;
 my $URL   =
     "<A HREF=\"http://www.fml.org/software/\">Mail::Message::ToHTML</A>";
 
-my $version = q$FML: ToHTML.pm,v 1.41.2.4 2003/06/03 13:43:49 fukachan Exp $;
+my $version = q$FML: ToHTML.pm,v 1.41.2.5 2003/06/14 06:03:20 fukachan Exp $;
 if ($version =~ /,v\s+([\d\.]+)\s+/) {
     $version = "$URL $1";
 }
@@ -2094,24 +2094,9 @@ sub _print_li_filename
 sub _who_of_address
 {
     my ($self, $address) = @_;
-    my ($user);
 
-    use Mail::Address;
-    my (@addrs) = Mail::Address->parse($address);
-
-    for my $addr (@addrs) {
-	if (defined( $addr->phrase() )) {
-	    my $phrase = $self->_decode_mime_string( $addr->phrase() );
-
-	    if ($phrase) {
-		return($phrase);
-	    }
-	}
-
-	$user = $addr->user();
-    }
-
-    return( $user ? "$user\@xxx.xxx.xxx.xxx" : $address );
+    use Mail::Message::Utils;
+    return Mail::Message::Utils::from_to_name($address);
 }
 
 
diff --git a/fml/lib/Mail/Message/Utils.pm b/fml/lib/Mail/Message/Utils.pm
index 7c97d60c..e90056b0 100644
--- a/fml/lib/Mail/Message/Utils.pm
+++ b/fml/lib/Mail/Message/Utils.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: Utils.pm,v 1.4 2002/09/22 14:57:05 fukachan Exp $
+# $FML: Utils.pm,v 1.5 2002/12/22 03:08:49 fukachan Exp $
 #
 
 package Mail::Message::Utils;
@@ -51,6 +51,41 @@ sub remove_subject_tag_like_string
 }
 
 
+=head2 from_to_name($address)
+
+extract gecos field in $address with shielding the real address.
+
+=cut
+
+
+# Descriptions: extract gecos field in $address
+#    Arguments: OBJ($self) STR($address)
+# Side Effects: none
+# Return Value: STR
+sub from_to_name
+{
+    my ($address) = @_;
+    my ($user);
+
+    use Mail::Address;
+    my (@addrs) = Mail::Address->parse($address);
+
+    for my $addr (@addrs) {
+	if (defined( $addr->phrase() )) {
+	    my $phrase = $self->_decode_mime_string( $addr->phrase() );
+
+	    if ($phrase) {
+		return($phrase);
+	    }
+	}
+
+	$user = $addr->user();
+    }
+
+    return( $user ? "$user\@xxx.xxx.xxx.xxx" : $address );
+}
+
+
 =head1 CODING STYLE
 
 See C<http://www.fml.org/software/FNF/> on fml coding style guide.