Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handy net #509

Merged
merged 2 commits into from
Apr 26, 2015
Merged

Fix handy net #509

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
806ac99
Updated handy_net_utilities to parse two email address cases;
hplato Apr 25, 2015
952a0fa
Added in additional unicode checks
hplato Apr 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 44 additions & 9 deletions lib/handy_net_utilities.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,24 +1487,59 @@ sub main::net_mail_summary {
$date_received = $date unless $date_received;

# Parse any unicode from headers...
$from =~ s/\"//g;
if ($from =~ m/=\?/) {
print "Unicode detected. Decoding MIME-Header from $from to " if $parms{debug} or $main::Debug{net};
$from = decode("MIME-Header", $from);
print "$from.\n" if $parms{debug} or $main::Debug{net};
if ($sender =~ m/=\?/) {
print "Unicode detected. Decoding MIME-Header sender $sender to " if $parms{debug} or $main::Debug{net};
$sender = decode("MIME-Header", $sender);
print "$sender.\n" if $parms{debug} or $main::Debug{net};
}
if ($to =~ m/=\?/) {
print "Unicode detected. Decoding MIME-Header to $to to " if $parms{debug} or $main::Debug{net};
$to = decode("MIME-Header", $to);
print "$to.\n" if $parms{debug} or $main::Debug{net};
}
if ($cc =~ m/=\?/) {
print "Unicode detected. Decoding MIME-Header cc $cc to " if $parms{debug} or $main::Debug{net};
$cc = decode("MIME-Header", $cc);
print "$cc.\n" if $parms{debug} or $main::Debug{net};
}
if ($subject =~ m/=\?/) {
print "Unicode detected. Decoding MIME-Header subject $subject to " if $parms{debug} or $main::Debug{net};
$subject = decode("MIME-Header", $subject);
print "$subject.\n" if $parms{debug} or $main::Debug{net};
}
# Process 'from' into speakable name
($from_name) = $from =~ /\((.+)\)/;
($from_name) = $from =~ / *(.+?) *</ unless $from_name;

#special parse from so we can speak it out
$from =~ s/\"//g;
$from =~ s/^\s+//; #remove spaces

#parse two special cases:
# '"last, first: org (sub-org)" <[email protected]>'
#$' <[email protected]>'


if ($from =~ m/^\</) { #just an email address with no friendly name, so just return the email address
($from_name) = $from =~ /^\<(.*)\>$/; #remove < and > from email address
} else {

if ($from =~ m/=\?/) {
print "Unicode detected. Decoding MIME-Header from $from to " if $parms{debug} or $main::Debug{net};
$from = decode("MIME-Header", $from);
print "$from.\n" if $parms{debug} or $main::Debug{net};
}
# Process 'from' into speakable name
# ($from_name) = $from =~ /\((.+)\)/; #remove this. I don't know why you'd want to just select text in ()?
($from_name) = $from =~ / *(.+?) *</;
($from_name) = $from =~ / *(\S+) *@/ unless $from_name;
$from_name = $from unless $from_name; # Sometimes @ is carried onto next record
$from_name =~ tr/_/ /;
# $from_name =~ tr/"//;
$from_name =~ s/\"//g; # "first last"
$from_name = "$2 $1" if $from_name =~ /(\S+), +(\S+)/; # last, first
$from_name =~ s/://g; #:'s have no place in an email address
# $from_name =~ s/ (\S)\. / $1 /; # Drop the "." after middle initial abreviation.
# Spammers blank this out, so no point in warning about it
# print "Warning, net_mail_summary: No From name found: from=$from, header=$header\n" unless $from_name;
}
print "Warning, net_mail_summary: No From name found: from=$from, header=$header\n" unless $from_name;

my $age_msg = int((time - str2time($date_received)) / 60);
print "Warning, net_mail_summary: age is negative: age=$age_msg, date=$date_received\n" if $age_msg < 0;
Expand Down