From: Andrew DeFaria Date: Wed, 9 Mar 2022 18:12:17 +0000 (-0800) Subject: Merge branch 'Speak' X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=294415e0b506d050524eecc134dc0fa0b5d57f49;hp=-c;p=clearscm.git Merge branch 'Speak' --- 294415e0b506d050524eecc134dc0fa0b5d57f49 diff --combined maps/bin/maps index fc0a65f,c3e1c64..594d2d9 --- a/maps/bin/maps +++ b/maps/bin/maps @@@ -125,7 -125,7 +125,7 @@@ sub ValidDomainUser($) sub formatRule($) { my ($rec) = @_; - return "$rec->{pattern}\@$rec->{domain}:$rec->{sequence}/$rec->{hit_count}"; + return "$rec->{pattern}\@$rec->{domain}:$rec->{sequence}/$rec->{hit_count} $rec->{comment}"; } # formatRule sub ProcessMsgs ($$$) { @@@ -161,7 -161,7 +161,7 @@@ if ($msgInfo{sender} eq $user_email and (lc ($msgInfo{sender_long}) !~ lc ("\"$username\" <$user_email>") and lc ($msgInfo{sender_long}) !~ lc ("$username <$user_email>"))) { - $log->msg("Nulllisting message from sender ($msgInfo{sender_long}) pretending to be $user_email"); + $log->msg("Nulllisting message from sender ($msgInfo{sender_long}) pretending to be $user_email - Subject: $msgInfo{subject}"); next; } # if @@@ -169,7 -169,7 +169,7 @@@ # Discard messges coming from andrew@clearscm.com because I don't send from # that email address if (lc $msgInfo{to} eq 'andrew@clearscm.com') { - $log->msg("Nulllisting message from Andrew\@ClearSCM.com since I don't send from that email address"); + $log->msg("Nulllisting message from Andrew\@ClearSCM.com since I don't send from that email address - Subject: $msgInfo{subject}"); next; } # if @@@ -179,11 -179,11 +179,11 @@@ if ($onlist) { if (ValidDomainUser $msgInfo{sender}) { - $log->msg("Whitelisting $msgInfo{sender} - Rule: " . formatRule($rec)); + $log->msg("Whitelisting $msgInfo{sender} - Rule: " . formatRule($rec) . " - Subject: $msgInfo{subject}"); Whitelist $msgInfo{sender}, $msgInfo{data}, $rec->{sequence}, $rec->{hit_count}; } else { - $log->msg("Sender ($msgInfo{sender}) from this domain but user not found"); + $log->msg("Sender ($msgInfo{sender}) from this domain but user not found - Subject: $msgInfo{subject}"); Nulllist $msgInfo{sender}; } # if @@@ -195,7 -195,7 +195,7 @@@ ($onlist, $rec) = OnBlacklist $msgInfo{sender}; if ($onlist) { - $log->msg("Blacklisting $msgInfo{sender} - Rule: " . formatRule($rec)); + $log->msg("Blacklisting $msgInfo{sender} - Rule: " . formatRule($rec) . " - Subject: $msgInfo{subject}"); Blacklist( userid => $userid, @@@ -212,7 -212,7 +212,7 @@@ ($onlist, $rec) = OnNulllist $msgInfo{sender}; if ($onlist) { - $log->msg("Nulllisting $msgInfo{sender} - Rule: " . formatRule($rec)); + $log->msg("Nulllisting $msgInfo{sender} - Rule: " . formatRule($rec) . " - Subject: $msgInfo{subject}"); Nulllist $msgInfo{sender}, $rec->{sequence}, $rec->{hit_count}; @@@ -220,7 -220,7 +220,7 @@@ } # if # Return processing: - $log->msg("Returning message from $msgInfo{sender}"); + $log->msg("Returning message from $msgInfo{sender} - Subject: $msgInfo{subject}"); ReturnMsg( userid => $userid, diff --combined rc/gitignore index ffc8f7e,add385f..f00cab3 --- a/rc/gitignore +++ b/rc/gitignore @@@ -1,5 -1,11 +1,11 @@@ .project .pydevproject .includepath -.vscode/ +.perldb.hist - /.vscode/ + + # For some reason something keeps deleting my .gitignore file especially + # in projects like /opt/songbook so I'm gonna reloate them here + /opt/songbook/Tonight Only.lst + /opt/songbook/.pydevproject + /opt/songbook/.vscode + /opt/songbook/.project diff --combined web/Resumes/Andrew/index.php index ded9b59,2c14309..9372526 --- a/web/Resumes/Andrew/index.php +++ b/web/Resumes/Andrew/index.php @@@ -4,7 -4,7 +4,7 @@@ - ClearSCM: Our People: Andrew DeFaria - President + Andrew DeFaria's Resume @@@ -55,18 -55,18 +55,18 @@@ function stoptimer () $count++; - fclose($resumeHit); + //fclose($resumeHit); $resumeHit = fopen ('.resumehits', 'w'); - fwrite($resumeHit, $count); - fclose($resumeHit); + //fwrite($resumeHit, $count); + //fclose($resumeHit); - $resumeHist = fopen('.resume.hist', 'a'); + //$resumeHist = fopen('.resume.hist', 'a'); $date = date(DATE_RFC822); - fwrite($resumeHist, "$_SERVER[REMOTE_ADDR] read resume at $date\n"); - fclose($resumeHist); + //fwrite($resumeHist, "$_SERVER[REMOTE_ADDR] read resume at $date\n"); + //fclose($resumeHist); $msg = ''; $msg .= '

Somebody just visited your resume.