Merge remote-tracking branch 'origin/master' into leenooks/sbbs-master

src/sbbs3/mailsrvr.c

@@ -2719,9 +2719,6 @@ static void parse_mail_address(char* p
 	if((tp=strchr(p,'"'))!=NULL) {	/* name in quotes? */
 		p=tp+1;
 		tp=strchr(p,'"');
-	} else if(*p == '\'') {	/* MS Outlook will put names in single-quotes */
-		p++;
-		tp=strchr(p, '\'');
 	} else if((tp=strchr(p,'('))!=NULL) {	/* name in parenthesis? */
 		p=tp+1;
 		tp=strchr(p,')');
@@ -3961,7 +3958,7 @@ static void smtp_thread(void* arg)
 						,server_name
 						,revision,PLATFORM_DESC
 						,with_clauses[with_val]
-						,rcpt_to,msgdate(msg.hdr.when_imported,date)
+						,forward_path,msgdate(msg.hdr.when_imported,date)
 						,reverse_path);
 					smb_hfield_add_str(&newmsg, SMTPRECEIVED, hdrfield, /* insert: */TRUE);
 
@@ -3976,6 +3973,10 @@ static void smtp_thread(void* arg)
 							*tp = 0;
 							truncsp(rcpt_name);
 						}
+						if(!matchusername(&scfg, rcpt_name, rcpt_to)) {
+							SAFECOPY(rcpt_name, rcpt_to);
+							truncstr(rcpt_name, "@");
+						}
 					}
 					smb_hfield_str(&newmsg, RECIPIENT, rcpt_name);
 					if(forward_path[0] != 0)
@@ -4663,10 +4664,9 @@ static void smtp_thread(void* arg)
 							faddr.zone = zone;
 
 							lprintf(LOG_INFO,"%04d %s %s %s relaying to FidoNet address: %s (%s)"
-								,socket, client.protocol, client_id, relay_user.alias, tp+1, smb_faddrtoa(&faddr, NULL));
-
+								,socket, client.protocol, client_id, relay_user.alias, p, smb_faddrtoa(&faddr, NULL));
 							fprintf(rcptlst,"[%u]\n",rcpt_count++);
-							fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENT),rcpt_addr);
+							fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENT), p);
 							fprintf(rcptlst,"%s=%u\n",smb_hfieldtype(RECIPIENTNETTYPE),NET_FIDO);
 							fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(RECIPIENTNETADDR),smb_faddrtoa(&faddr,NULL));
 							fprintf(rcptlst,"%s=%s\n",smb_hfieldtype(SMTPFORWARDPATH),rcpt_to);

src/sbbs3/sbbsecho.c

@@ -3322,8 +3322,9 @@ int fmsgtosmsg(char* fbuf, fmsghdr_t* hdr, uint usernumber, uint subnum)
 			lprintf(LOG_ERR, "Error %d reading user #%u", i, usernumber);
 			return SMB_FAILURE;
 		}
-		if((scfg.sys_misc&SM_FWDTONET) && (user.misc&NETMAIL) && is_supported_netmail_addr(&scfg, user.netmail)) {
-			uint16_t nettype = NET_UNKNOWN;
+		uint16_t nettype;
+		if((scfg.sys_misc&SM_FWDTONET) && (user.misc&NETMAIL)
+			&& (nettype = smb_netaddr_type(user.netmail)) >= NET_UNKNOWN) {
 			smb_hfield_netaddr(&msg, RECIPIENTNETADDR, user.netmail, &nettype);
 			smb_hfield_bin(&msg, RECIPIENTNETTYPE, nettype);
 		} else {

src/sbbs3/userdat.c

@@ -56,10 +56,8 @@ static const char* strIpFilterExemptConfigFile = "ipfilter_exempt.cfg";
 uint matchuser(scfg_t* cfg, const char *name, BOOL sysop_alias)
 {
 	int		file,c;
-	char*	p;
 	char	dat[LEN_ALIAS+2];
 	char	str[256];
-	char	tmp[256];
 	ulong	l,length;
 	FILE*	stream;
 
@@ -79,42 +77,7 @@ uint matchuser(scfg_t* cfg, const char *name, BOOL sysop_alias)
 		for(c=0;c<LEN_ALIAS;c++)
 			if(dat[c]==ETX) break;
 		dat[c]=0;
-		if(!stricmp(dat,name))
-			break;
-		/* convert dots to spaces */
-		strcpy(str,dat);
-		REPLACE_CHARS(str,'.',' ',p);
-		if(!stricmp(str,name))
-			break;
-		/* convert spaces to dots */
-		strcpy(str,dat);
-		REPLACE_CHARS(str,' ','.',p);
-		if(!stricmp(str,name))
-			break;
-		/* convert dots to underscores */
-		strcpy(str,dat);
-		REPLACE_CHARS(str,'.','_',p);
-		if(!stricmp(str,name))
-			break;
-		/* convert underscores to dots */
-		strcpy(str,dat);
-		REPLACE_CHARS(str,'_','.',p);
-		if(!stricmp(str,name))
-			break;
-		/* convert spaces to underscores */
-		strcpy(str,dat);
-		REPLACE_CHARS(str,' ','_',p);
-		if(!stricmp(str,name))
-			break;
-		/* convert underscores to spaces */
-		strcpy(str,dat);
-		REPLACE_CHARS(str,'_',' ',p);
-		if(!stricmp(str,name))
-			break;
-		/* strip spaces (from both) */
-		strip_space(dat,str);
-		strip_space(name,tmp);
-		if(!stricmp(str,tmp))
+		if(matchusername(cfg, dat, name))
 			break;
 	}
 	fclose(stream);
@@ -123,6 +86,33 @@ uint matchuser(scfg_t* cfg, const char *name, BOOL sysop_alias)
 	return(0);
 }
 
+/****************************************************************************/
+/* Return TRUE if the user 'name' (or alias) matches with 'comp'			*/
+/* ... ignoring non-alpha-numeric chars in either string					*/
+/* and terminating the comparison string at an '@'							*/
+/****************************************************************************/
+BOOL matchusername(scfg_t* cfg, const char* name, const char* comp)
+{
+	(void)cfg; // in case we want this matching logic to be configurable in the future
+
+	const char* np = name;
+	const char* cp = comp;
+	while(*np != '\0' && *cp != '\0' && *cp != '@') {
+		if(!isalnum(*np)) {
+			np++;
+			continue;
+		}
+		if(!isalnum(*cp)) {
+			cp++;
+			continue;
+		}
+		if(toupper(*np) != toupper(*cp))
+			break;
+		np++, cp++;
+	}
+	return *np == '\0' && (*cp == '\0' || *cp == '@');
+}
+
 /****************************************************************************/
 uint total_users(scfg_t* cfg)
 {
@@ -2625,7 +2615,6 @@ char* usermailaddr(scfg_t* cfg, char* addr, const char* name)
 		for(i=0;addr[i];i++)
 			if(addr[i]==' ' || addr[i]&0x80)
 				addr[i]='.';
-		strlwr(addr);
 	}
 	if(VALID_CFG(cfg)) {
 		strcat(addr,"@");
@@ -3653,11 +3642,11 @@ int lookup_user(scfg_t* cfg, link_list_t* list, const char *inname)
 		close(userdat);
 	}
 	for(list_node_t* node = listFirstNode(list); node != NULL; node = node->next) {
-		if(stricmp(((user_t*)node->data)->alias, inname) == 0)
+		if(matchusername(cfg, ((user_t*)node->data)->alias, inname))
 			return ((user_t*)node->data)->number;
 	}
 	for(list_node_t* node = listFirstNode(list); node != NULL; node = node->next) {
-		if(stricmp(((user_t*)node->data)->name, inname) == 0)
+		if(matchusername(cfg, ((user_t*)node->data)->name, inname))
 			return ((user_t*)node->data)->number;
 	}
 	return 0;

src/sbbs3/userdat.h

@@ -75,6 +75,7 @@ DLLEXPORT int	fgetuserdat(scfg_t*, user_t*, int file);
 DLLEXPORT int	putuserdat(scfg_t*, user_t*);	/* Put userdat struct into user file	*/
 DLLEXPORT int	newuserdat(scfg_t*, user_t*);	/* Create new userdat in user file */
 DLLEXPORT uint	matchuser(scfg_t*, const char *str, BOOL sysop_alias); /* Checks for a username match */
+DLLEXPORT BOOL	matchusername(scfg_t*, const char* name, const char* compare);
 DLLEXPORT char* alias(scfg_t*, const char* name, char* buf);
 DLLEXPORT int	putusername(scfg_t*, int number, char * name);
 DLLEXPORT uint	total_users(scfg_t*);

text/menu/msghdrexample.asc

@@ -7,4 +7,5 @@
  Attr: @MSG_ATTR-L.....................................@ 
  Date: @MSG_DATE-L............@ @MSG_TIMEZONE-L9@ @MSG_AGE-R14@ 
 
+@EXEC:SHOWMSGAVATAR@