diff src/context.h @ 167:9b129ed78d7d stable-6-0-6

actually use spamassassin result, allow build without spam assassin, only call it if some recipient needs it.
author carl
date Mon, 27 Aug 2007 20:49:19 -0700
parents 5809bcdc325b
children 6bac960af6b4
line wrap: on
line diff
--- a/src/context.h	Sun Aug 26 20:54:59 2007 -0700
+++ b/src/context.h	Mon Aug 27 20:49:19 2007 -0700
@@ -191,9 +191,9 @@
 	void		add_cctld(char *cctld)						{content_cctlds.insert(cctld);	  };
 
 	void		set_host_limit(int limit)					{host_limit 		= limit;  };
-	void		set_spamassassin_limit(int limit)			{spamassassin_limit = limit;  };
 	void		set_host_message(char *message) 			{host_limit_message = message;};
 	void		set_host_random(bool random)				{host_random		= random; };
+	void		set_spamassassin_limit(int limit)			{spamassassin_limit = limit;  };
 	void		set_tag_limit(int limit)					{tag_limit			= limit;  };
 	void		set_tag_message(char *message)				{tag_limit_message	= message;};
 	void		add_tag(char *tag)							{html_tags.insert(tag); 	  };
@@ -204,8 +204,8 @@
 
 	bool			get_content_filtering() 				{return content_filtering; };
 	int 			get_host_limit()						{return host_limit; 	   };
-	int 			get_spamassassin_limit()				{return spamassassin_limit;};
 	bool			get_host_random()						{return host_random;	   };
+	int 			get_spamassassin_limit()				{return (content_filtering) ? spamassassin_limit : 0;};
 	char*			get_content_suffix();
 	char*			get_content_message();
 	char*			get_uribl_suffix();
@@ -216,10 +216,10 @@
 	string_set& 	get_html_tags();
 	dnsblp_list&	get_dnsbl_list();
 
-	bool		acceptable_content(recorder &memory, int score, char *&msg);
+	bool		acceptable_content(recorder &memory, int score, string& msg);
 	bool		ignore_host(char *host);
 
-	void		dump(bool isdefault, int level = 0);
+	void		dump(bool isdefault, bool &spamass, int level = 0);
 };