New feature: AKAMATCHFROMTO

cfgs/config/advanced.cfg

@@ -126,6 +126,9 @@ AKA     1:23/45.67@fidonet.org
 AKAMATCHNET YES                 ; Enable aka matching in netmail.
 ;AKAMATCHECHO NO                 ; No aka matching in echomail.
 ;AKAMATCHLOCAL NO                ; No aka matching in local areas.
+;AKAMATCHFROMTO NO               ; No aka matching using the "To" field
+                                ; (use the "From" field only).
+
 
 ----------------------------------------------------------------------
 -- NODELISTS AND USERLISTS
@@ -425,7 +428,7 @@ STATUSLINECLOCK Yes
 -- MESSAGE EDITOR
 
 // Chars to display instead of CR and space in the internal editor.
-;EDITCHARPARA  '' 
+;EDITCHARPARA  ''
 ;EDITCHARSPACE ú ged+
 ;EDITCHARSPACE 'ú'
 
@@ -613,7 +616,7 @@ QUOTESTRING " FL> "
 //  QUOTEWRAPHARD <yes/no>  (yes)
 //    This keyword controls behaviour of quoted text (wrap or reflow).
 
-// QUOTEBUFFILE 
+// QUOTEBUFFILE
 // If used, it sets the default filename for the quotebuffer. If no
 // path is specified, the GOLDPATH is used.
 //   NOTE: If this keyword is used in globally (in GOLDED.CFG), it

cfgs/config/advanced.rus

@@ -92,7 +92,10 @@ AKA     2:5063/77@fidonet.org  ;
 AKAMatchNet   Yes               ; <20> §à¥è¨âì ¢ Netmail.
 AKAMatchEcho  No                ; ‡ ¯à¥â¨âì ¢ echomail. (<28>…ŠŽŒ…<C592>„“…’‘Ÿ!)
 AKAMatchLocal Yes               ; <20> §p¥è¨âì ¢ «®ª «ì­ëå ®¡« áâïå.
-
+AKAMatchFromTo No               ; ‚롨à âì AKA ⮫쪮 ­  ®á­®¢ ­¨¨ ¯®«ï From
+;AKAMatchFromTo Yes              ; ‘­ ç «  ¢ë¡¨à âì AKA ­  ®á­®¢ ­¨¨ ¯®«ï From,
+                                ; ¥á«¨ ¦¥ ­¥â ¯à ¢¨«  ¤«ï ¯®«ï From, ⮣¤ 
+                                ; ¢ë¡¨à âì AKA ­  ®á­®¢ ­¨¨ ¯®«ï To.
 
 ----------------------------------------------------------------------
 -- <20>Ž„‹ˆ‘’› ˆ ‘<>ˆ‘Šˆ <20>Ž‹œ‡Ž‚€’…‹…‰ (USERLISTS)

docs/notework.txt

@@ -10,6 +10,12 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
++ New AKA matching feature: match for "From" field then (if not matched)
+  match for "To" field. New config token AKAMATCHFROMTO (yes/no).
+  (Patch from Ianos Gnatiuc 2:5030/830.17)
+
+- MS Visual C build now contains Goldnode+ (patch from Ianos Gnatiuc).
+
 - Fix man pages.
 
 - Fix subshell start message output (bugreport from Semen Panevin).

golded3/gccfgg.cpp

@@ -686,6 +686,7 @@ CfgGed::CfgGed() {
   adeptxbbsuserno = 0;
   addressbookadd = YES;
   addresslookupfirst = false;
+  akamatchfromto = false;
   areaautoid = AUTOID_LONG;
   areacopydirect = false;
   areacopyaddid = false;

golded3/gccfgg.h

@@ -36,6 +36,7 @@ const word CRC_ADEPTXBBSUSERNO  = 0x0E98;
 const word CRC_AKA              = 0x13A4;
 const word CRC_AKAMATCH         = 0xF237;
 const word CRC_AKAMATCHECHO     = 0xF0C1;
+const word CRC_AKAMATCHFROMTO   = 0xD8B9;
 const word CRC_AKAMATCHING      = 0x869A;
 const word CRC_AKAMATCHLOCAL    = 0x4AC4;
 const word CRC_AKAMATCHNET      = 0xFD6E;

golded3/gccfgg0.cpp

@@ -190,6 +190,7 @@ SwitchA:
     case CRC_ADEPTXBBSUSERNO  :  CfgAdeptxbbsuserno  ();  break;
     case CRC_AKA              :  CfgAddress          ();  break;
     case CRC_AKAMATCH         :  CfgAkamatch         ();  break;
+    case CRC_AKAMATCHFROMTO   :  CfgAkamatchfromto   ();  break;
     case CRC_AKAMATCHING      :  CfgAkamatching      ();  break;
     case CRC_AREAAUTOID       :  CfgAreaautoid       ();  break;
     case CRC_AREACFMREPLYTO   :  CfgAreacfmreplyto   ();  break;

golded3/gccfgg1.cpp

@@ -83,12 +83,12 @@ void CfgAddresslookupfirst(){
   else
     CFG->addresslookupfirst = NO;
 }
- 
+
 //  ------------------------------------------------------------------
 
 void CfgAddressmacro(char* v)  { val = v; CfgAddressmacro(); }
 void CfgAddressmacro() {
-            
+
   AddrMacro tmp;
   tmp.attr.reset();
   int subjwasquoted = NO;
@@ -175,6 +175,12 @@ void CfgAkamatch() {
 
 //  ------------------------------------------------------------------
 
+void CfgAkamatchfromto() {
+  CFG->akamatchfromto = (0 != GetYesno(val));
+}
+
+//  ------------------------------------------------------------------
+
 void CfgAkamatching() {
 
   if(cfgingroup) {
@@ -203,7 +209,7 @@ void CfgAreaautoid() {
 }
 
 //  ------------------------------------------------------------------
-  
+
 void CfgAreacfmreplyto() {
 
   strxcpy(CFG->areacfmreplyto, val, sizeof(Echo));
@@ -400,7 +406,7 @@ void CfgAreapmscanincl() {
 //  ------------------------------------------------------------------
 
 void CfgAreareadonly() {
-  
+
   if(strieql(val, "Soft"))
     CFG->areareadonly = READONLY_SOFT;
   else if(strieql(val, "Hard"))

golded3/gcprot.h

@@ -39,6 +39,7 @@ void CfgAdeptxbbspath    ();
 void CfgAdeptxbbsuserno  ();
 void CfgAkamatch         ();
 void CfgAkamatchecho     ();
+void CfgAkamatchfromto   ();
 void CfgAkamatching      ();
 void CfgAkamatchlocal    ();
 void CfgAkamatchnet      ();

golded3/gecfgg.h

@@ -140,6 +140,7 @@ public:
   int         adeptxbbsuserno;
   std::vector<gaka> aka;
   std::vector<AkaMatchG> akamatch;
+  bool        akamatchfromto;
   int         areaautoid;
   Echo        areacfmreplyto;
   bool        areacopydirect;
@@ -448,7 +449,7 @@ protected:
     int hardline;
     int spellchecker;
   } cfg;
-  
+
   // -----------------------------------------------------------------
   // String bag