--- dspam_notify 2011-11-03 11:46:56.000000000 +1000 +++ dspam_notify.jlk 2011-11-03 11:49:51.000000000 +1000 @@ -10,7 +10,8 @@ $BINDIR = '/usr/local/bin'; # Who will the notifications be sent from? -$FROM = 'dspam@domain.tld'; +$FROM_EMAIL = 'dspam@domain.tld'; +$FROM_NAME = 'Dspam Filter'; # What will the notification subject be? $SUBJECT = 'Daily Spam Quarantine Summary'; @@ -56,7 +57,7 @@ my ($SEC,$MIN,$HOUR,$MDAY,$MON,$YEAR,$WDAY,$YDAY,$ISDST) = localtime(time); # Array containing Days of the week abreviations -@WEEKDAYS = ('Sun','Mon','Tue','Wed','Thur','Fri','Sat'); +@WEEKDAYS = ('Sun','Mon','Tue','Wed','Thu','Fri','Sat'); # Array containing Month abreviations @MONTHS = ('Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'); @@ -69,8 +70,14 @@ $DAY_NUM = $MDAY; $YEAR += 1900; -$TODAY = $DAY_ABR . " " . $MONTH_ABR . " " . $DAY_NUM; - +# Workaround issue where DAY_NUM is less than 10, dspam writes an addtional leading space for +# for day numbers with a single digit to the quarantine .mbox file +if ($DAY_NUM < 10) { + $TODAY = $DAY_ABR . " " . $MONTH_ABR . " " . $DAY_NUM; +} else { + $TODAY = $DAY_ABR . " " . $MONTH_ABR . " " . $DAY_NUM; +} + # Get the location of DSPAM home and if AllowOverride is set for dailyQuarantineSummary $DSPAMHOME = ""; $ALLOW_OVERRIDE = ""; @@ -212,13 +219,15 @@ Timeout => 30) || die ("Could not connect to SMTP server " . $SERVER . ":" . $PORT . "; $!"); for ($I = 0; $I <= $#RECIPIENT_LIST; $I++) { # Loop through Recipients List and send the message if (@Q_TOTAL_ITEMS[$I] != 0) { # Don't send reminders to users with empty quarantines - $SMTP->mail($FROM); + $SMTP->mail($FROM_EMAIL); $SMTP->to($RECIPIENT_LIST[$I]); $SMTP->data(); + $SMTP->datasend("From: $FROM_NAME <$FROM_EMAIL>\n"); $SMTP->datasend("To: $RECIPIENT_LIST[$I]\n"); $SMTP->datasend("Subject: $SUBJECT\n"); $SMTP->datasend("Mime-Version: 1.0\n"); $SMTP->datasend("Content-Type: text/html; charset=UTF-8\n"); + $SMTP->datasend("\n"); $SMTP->datasend("\n"); $SMTP->datasend("\n"); $SMTP->datasend("DSPAM Quarantine Summary for $RECIPIENT_LIST[$I]\n");