X-Git-Url: http://git.pk910.de/?p=srvx.git;a=blobdiff_plain;f=src%2Fspamserv.c;h=f0ccca5d825f6f0226d072861493111f4fe71a60;hp=aaf17b7178896829ee26038b11faab8f4d33edc8;hb=58d823d306b690515fbc6f671636d4ec152b867a;hpb=18a22dac8302182719e030976fa1c045bde8a461

diff --git a/src/spamserv.c b/src/spamserv.c
index aaf17b7..f0ccca5 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -36,6 +36,7 @@
 #define KEY_EXPIRY                   "expiry"
 
 #define KEY_DEBUG_CHANNEL            "debug_channel"
+#define KEY_OPER_CHANNEL            "oper_channel"
 #define KEY_GLOBAL_EXCEPTIONS        "global_exceptions"
 #define KEY_NETWORK_RULES            "network_rules"
 #define KEY_TRIGGER                  "trigger"
@@ -70,6 +71,7 @@ dict_t killed_users_dict;
 
 #define spamserv_notice(target, format...) send_message(target , spamserv , ## format)
 #define spamserv_debug(format...) do { if(spamserv_conf.debug_channel) send_channel_message(spamserv_conf.debug_channel , spamserv , ## format); } while(0)
+#define spamserv_oper_message(format...) do { if(spamserv_conf.oper_channel) send_channel_message(spamserv_conf.oper_channel , spamserv , ## format); } while(0)
 #define ss_reply(format...)	send_message(user , spamserv , ## format)
 
 #define SET_SUBCMDS_SIZE 10
@@ -121,6 +123,8 @@ static const struct message_entry msgtab[] = {
     { "SSMSG_STATUS_MEMORY",           "$bMemory Information:$b" },
     { "SSMSG_STATUS_CHANNEL_LIST",     "$bRegistered Channels:$b" },
     { "SSMSG_STATUS_NO_CHANNEL",       "No channels registered." },
+    { "SSMSG_CHANNEL_REGISTERED",	   "%s (channel %s) registered by %s." },
+    { "SSMSG_CHANNEL_UNREGISTERED",	   "%s (channel %s) unregistered by %s." },
 	{ NULL, NULL }
 };
 
@@ -141,6 +145,7 @@ static const struct message_entry msgtab[] = {
 static struct
 {
 	struct chanNode *debug_channel;
+	struct chanNode *oper_channel;
 	struct string_list *global_exceptions;
 	const char *network_rules;
 	unsigned char trigger;
@@ -1088,8 +1093,7 @@ SPAMSERV_FUNC(cmd_register)
 
 	spamserv_join_channel(cInfo->channel);
 	
-	snprintf(reason, sizeof(reason), "%s (channel %s) registered by %s.", spamserv->nick, channel->name, user->handle_info->handle);
-	global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+	spamserv_oper_message("SSMSG_CHANNEL_REGISTERED", spamserv->nick, channel->name, user->handle_info->handle);
 	ss_reply("SSMSG_REG_SUCCESS", channel->name);
 
 	return 1;
@@ -1138,8 +1142,7 @@ SPAMSERV_FUNC(cmd_unregister)
 	
 	spamserv_unregister_channel(cInfo);	
 
-	snprintf(reason, sizeof(reason), "%s (channel %s) unregistered by %s.", spamserv->nick, channel->name, user->handle_info->handle);
-	global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+	spamserv_oper_message("SSMSG_CHANNEL_UNREGISTERED", spamserv->nick, channel->name, user->handle_info->handle);
 	ss_reply("SSMSG_UNREG_SUCCESS", channel->name);
 
 	return 1;
@@ -1930,7 +1933,6 @@ spamserv_conf_read(void)
 	}
 
 	str = database_get_data(conf_node, KEY_DEBUG_CHANNEL, RECDB_QSTRING);
-
 	if(str)
 	{
 		spamserv_conf.debug_channel = AddChannel(str, now, "+tinms", NULL);
@@ -1943,6 +1945,16 @@ spamserv_conf_read(void)
 		spamserv_conf.debug_channel = NULL;
 	}
 
+	str = database_get_data(conf_node, KEY_OPER_CHANNEL, RECDB_QSTRING);
+	if(str)
+	{
+		spamserv_conf.oper_channel = AddChannel(str, now, "+tinms", NULL);
+	}
+	else
+	{
+		spamserv_conf.oper_channel = NULL;
+	}
+
 	spamserv_conf.global_exceptions = database_get_data(conf_node, KEY_GLOBAL_EXCEPTIONS, RECDB_STRING_LIST);
 
 	str = database_get_data(conf_node, KEY_NETWORK_RULES, RECDB_QSTRING);