projects / clearscm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 40501c0 8dcb245)
Merge branch 'Speak'
authorAndrew DeFaria <A.DeFaria@cpanel.net>
Wed, 9 Mar 2022 18:12:17 +0000 (10:12 -0800)
committerAndrew DeFaria <A.DeFaria@cpanel.net>
Wed, 9 Mar 2022 18:12:17 +0000 (10:12 -0800)
1  2 
maps/bin/maps patch | diff1 | diff2 | blob | history
rc/gitignore patch | diff1 | diff2 | blob | history
web/Resumes/Andrew/index.php patch | diff1 | diff2 | blob | history

diff --combined maps/bin/maps
index fc0a65f,c3e1c64..594d2d9
--- 1/maps/bin/maps
--- 2/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
--- 1/rc/gitignore
--- 2/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
--- 1/web/Resumes/Andrew/index.php
--- 2/web/Resumes/Andrew/index.php
+++ b/web/Resumes/Andrew/index.php
@@@ -4,7 -4,7 +4,7 @@@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    <meta name="GENERATOR" content="Mozilla/4.61 [en] (Win98; U) [Netscape]">
 -  <title>ClearSCM: Our People: Andrew DeFaria - President</title>
 +  <title>Andrew DeFaria's Resume</title>
    <link rel="stylesheet" type="text/css" media="screen" href="/css/Article.css">
    <link rel="stylesheet" type="text/css" media="print"  href="/css/Print.css">
    <link rel="SHORTCUT ICON" href="http://clearscm.com/favicon.ico" type="image/png">
@@@ -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  = '<html><body>';
    $msg .= '<h1>Somebody just visited your resume.</h1>';
ClearSCM Source Repository. Note parts of this repo are under GPL. Other parts are copyright ClearSCM, Inc.