: !defined $domain
? "$email_on_file\@"
: $email_on_file;
- if ($sender =~ /$search_for/i) {
+ if ($sender and $sender =~ /$search_for/i) {
$rule = "Matching rule: ($listtype:$sequence) \"$email_on_file\"";
$rule .= " - $comment" if $comment and $comment ne '';
$status = 1;
return $row[0];
} # Encrypt
-sub FindEmail(;$) {
- my ($sender) = @_;
+sub FindEmail(;$$) {
+ my ($sender, $date) = @_;
my $statement;
- if (!defined $sender || $sender eq '') {
- $statement = "select * from email where userid = '$userid'";
- } else {
- $statement = "select * from email where userid = '$userid' and sender = '$sender'";
- } # if
+ $sender //= '';
+ $date //= '';
+
+ $statement = "select * from email where userid = '$userid'";
+
+ # Add conditions if present
+ $statement .= " and sender = '$sender'" if $sender;
+ $statement .= " and timestamp = '$date'" if $date;
my $sth = $DB->prepare($statement)
or DBError('FindEmail: Unable to prepare statement', $statement);