= 8.5;
	log_critical: 'smtp_send8.lasso is only intended for Lasso 8.0 and 8.1 - not loading on ' + (lasso_version: -lassoversion);
	abort;
else;
	log_critical: 'smtp_send8.lasso custom version of smtp->send is loading';
/if;


// first create a prototype out of the original type

define_type('smtpbuiltin', 'email_smtp',
	-namespace = 'email_',
	-prototype);
/define_type;


// then subclass the prototype to replace the original, and redefining one of the member tags


define_type('smtp', 'email_smtpbuiltin',
	-namespace = 'email_');

	// ->Send
	// We send the message here
	define_tag('send',
		-required = 'from',
		-type = 'string',
		-required = 'recipients',
		-type = 'array',
		-required = 'message');

		local(
			'net' = @self->'net',
			'timeout' = @self->'timeout',
			'_message' = (string_replace: #message, -find='\r\n.', -replace='\r\n..'));

		if(!self->command(-send = 'RSET\r\n', -expect = 250));
			return(false);
		/if;

		//--------------------------------------------------
		// begin custom version by Johan Sölve
		
		
		local: 'js_smtp_from'=(string: #from),
			'js_smtp_from_header'='X-Bounce-to: ';

		// grab message headers
		local: 'js_headers' = ((string: #_message)->(split: '\r\n\r\n'))-> first;
		// unfold headers
		#js_headers=(string_replaceregexp: #js_headers, -find='\\r\\n\\s+', -replace='');
		// split message headers
		#js_headers = (#js_headers->split: '\r\n');
		// look for X-Bounce-To header
		iterate: #js_headers, (local: 'js_thisheader');
			if: #js_thisheader -> (beginswith: #js_smtp_from_header);
				#js_thisheader -> (removeleading: #js_smtp_from_header);
				// remove spaces in the data, if any (LP8.0.3 can add spaces in folded header data)
				#js_thisheader -> (replace: ' ', '');
				// check for reasonable address format
				// empty sender is allowed to be able to send bounce-like messages
				if: #js_thisheader == '' 
					|| (string_findregexp: #js_thisheader, -find='\\w+?@\\w+?\\.\\w+') -> size > 0;
					#js_smtp_from = #js_thisheader;
					#js_smtp_from -> trim;
					loop_abort;
				/if;
			/if;
		/iterate;
		#js_smtp_from = (string_replaceregexp: #js_smtp_from, -find='\\s', -replace='');
		
		// these lines are changed from the original
		if(!self->command(-send = 'MAIL FROM:<' #js_smtp_from '>\r\n', -expect = 250));
			return(false);
		/if;

		// end custom version by Johan Sölve
		//--------------------------------------------------


		iterate(#recipients, local('i'));
			if(!self->command(-send = 'RCPT TO:<' #i '>\r\n', -expect = 250));
				return(false);
			/if;
		/iterate;

		if(!self->command(-send = 'DATA\r\n', -expect = 354));
			return(false);
		/if;

		if(#net->wait(#timeout, net_waitwrite) == net_waitwrite);
			#net->write(#_message);
		/if;

		if(!self->command(-send = '\r\n.\r\n', -expect = 250));
			return(false);
		/if;

		return(true);
	/define_tag;


/define_type;

?>