[Pgp-tools-commit] r16 - trunk/caff

[Peter Palfrader]

Author: weasel
Date: 2004-07-03 06:33:13 -0600 (Sat, 03 Jul 2004)
New Revision: 16

Modified:
   trunk/caff/caff
Log:
Actually act according to the user's answer in the 'attach to every mail' question
Fix sanitize_uid

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2004-07-03 12:17:48 UTC (rev 15)
+++ trunk/caff/caff	2004-07-03 12:33:13 UTC (rev 16)
@@ -446,7 +446,8 @@
 sub sanitize_uid($) {
 	my ($uid) = @_;
 
-	my $good_uid =~ tr#/:\\#_#;
+	my $good_uid = $uid;
+	$good_uid =~ tr#/:\\#_#;
 	trace2("[sanitize_uid] changed UID from $uid to $good_uid.\n") if $good_uid ne $uid;
 	return $good_uid;
 };
@@ -713,7 +714,7 @@
 			trace("UID: $uid->{'text'}\n");
 			unless ($uid->{'text'} =~ /@/) {
 				my $attach = ask("UID $uid->{'text'} is no email address, attach it to every email sent?", 1);
-				push @attached, $uid;
+				push @attached, $uid if $attach;
 			};
 		};