Prechádzať zdrojové kódy

use vars instead of db

Pi 1 rok pred
rodič
commit
d1e6d5f1a3

+ 7 - 16
filters/cropswap-members@shandan.one

@@ -8,23 +8,14 @@ if ($FORWARD)
 }
 if (!$CONTINUE)
 {
-   flock $STAGE {
-      if (gdbmopen($STAGE, "W"))
-      {
-         cc "|$DEBUGMAIL progress-$MEMBERGROUP-fail"
-         EXITCODE=$FATAL
-         exit
-      }
-      foreach /^(To|Cc):\s+(.*)\s+\<$MEMBERGROUPREGEX\>$/
-      {
-         gdbmstore("TOALIAS", "$MATCH2")
-      }
-      gdbmstore("CONTINUE", "YES")
-      gdbmstore("TOMEMBER", "YES")
-      gdbmstore("MAILGROUP", "$MEMBERGROUP")
-      gdbmstore("SUBJECT", "Crop Swap Member")
-      gdbmclose
+   foreach /^(To|Cc):\s+(.*)\s+\<$MEMBERGROUPREGEX\>$/
+   {
+      TOALIAS=$MATCH2
    }
+   CONTINUE=1
+   TOMEMBER=1
+   MAILGROUP=$MEMBERGROUP
+   SUBJECT="Crop Swap Member"
 }
 elsif ($CONTINUE)
 {

+ 7 - 16
filters/cropswap@shandan.one

@@ -23,23 +23,14 @@ if($FORWARD)
 }
 if (!$CONTINUE)
 {
-   flock $STAGE {
-      if (gdbmopen($STAGE, "W"))
-      {
-         cc "|$DEBUGMAIL progress-$ORGANIZERGROUP-fail"
-         EXITCODE=$FATAL
-         exit
-      }
-      foreach /^(To|Cc):\s+(.*)\s+\<$ORGANIZERGROUPREGEX\>$/
-      {
-         gdbmstore("TOALIAS", "$MATCH2")
-      }
-      gdbmstore("CONTINUE", "YES")
-      gdbmstore("TOORGANIZER", "YES")
-      gdbmstore("MAILGROUP", "$ORGANIZERGROUP")
-      gdbmstore("SUBJECT", "Crop Swap Notice")
-      gdbmclose
+   foreach /^(To|Cc):\s+(.*)\s+\<$ORGANIZERGROUPREGEX\>$/
+   {
+      TOALIAS=$MATCH2
    }
+   CONTINUE=1
+   TOORGANIZER=1
+   MAILGROUP=$ORGANIZERGROUP
+   SUBJECT="Crop Swap Notice"
 }
 elsif($CONTINUE)
 {

+ 1 - 47
maildroprc

@@ -11,7 +11,7 @@ MAILBOT="/usr/bin/mailbot"
 SIGNUPRESP="/opt/cropswap/signup.eml"
 SUBSCRIBERESP="/opt/cropswap/subunsub.eml"
 FILTERDIR="/opt/cropswap/filters"
-DEBUG=1
+DEBUG=0
 if ($DEBUG)
 {
    MAILBOT="/opt/cropswap/debug.sh"
@@ -43,60 +43,15 @@ UNREGISTERED=3
 UNSUBSCRIBED=2
 FATAL=1
 
-STAGE="/var/mail/maildrop/stage"
-flock $STAGE {
-   if (gdbmopen($STAGE, "W") != 0)
-   {
-      cc "|$DEBUGMAIL init-stages-fail"
-      EXITCODE=$FATAL
-      exit
-   }
-   gdbmstore("CONTINUE", "NO")
-   gdbmstore("TOMEMBER", "NO")
-   gdbmstore("TOORGANIZER", "NO")
-   gdbmstore("TOPOSTMASTER", "NO")
-   gdbmstore("MAILGROUP", "NONE")
-      cc "|$DEBUGMAIL 'init variables pre fetch'"
-   if (gdbmstore("TOALIAS", "NONE") !=0)
-{
-
-      cc "|$DEBUGMAIL 'init variables fail write'"
-EXITCODE=$FATAL
-exit
-}
-   gdbmstore("SUBJECT", "")
-   CONTINUE=(gdbmfetch("CONTINUE") eq "YES")
-   TOALIAS=gdbmfetch("TOALIAS")
-      cc "|$DEBUGMAIL 'init variables'"
-   gdbmclose
-}
-
 foreach /^(To|Cc):.*/
 {
    ADDR=getaddr($MATCH)
    foreach (tolower $ADDR) =~ /^$HANDLEDREGEX$/
    {
-      cc "|$DEBUGMAIL 'include match $MATCH'"
       include "$FILTERDIR/$MATCH"
    }
 }
 
-if (gdbmopen($STAGE, "R"))
-{
-   cc "|$DEBUGMAIL progress-stages-fail"
-   EXITCODE=$FATAL
-   exit
-}
-CONTINUE=(gdbmfetch("CONTINUE") eq "YES")
-TOPOSTMASTER=(gdbmfetch("TOPOSTMASTER") eq "YES")
-TOMEMBER=(gdbmfetch("TOMEMBER") eq "YES")
-TOORGANIZER=(gdbmfetch("TOORGANIZER") eq "YES")
-MAILGROUP=gdbmfetch("MAILGROUP")
-SUBJECT=gdbmfetch("SUBJECT")
-      cc "|$DEBUGMAIL 'post variables pre fetch'"
-TOALIAS=gdbmfetch("TOALIAS")
-      cc "|$DEBUGMAIL 'post variables post fetch'"
-gdbmclose
 
 if (!$CONTINUE)
 {
@@ -175,7 +130,6 @@ if (!$FORWARD)
 # SUBSCRIBED USERS
 #
 NOFORWARD=$FROM
-cc "|$DEBUGMAIL forwarding"
 include "$FILTERDIR/$MAILGROUP"
 
 cc "|$DEBUGMAIL unhandled"