X-Git-Url: http://git.pk910.de/?p=srvx.git;a=blobdiff_plain;f=src%2Fspamserv.c;h=ddb3c16e1d96fe1ae214c59e4a54628340bb7ace;hp=7d6d9b3aeddff0e455ae0e0018dd24d2eb8e5ef2;hb=95ca19dd93fa5ef8d8756d0ef0ec1c39fe398650;hpb=df0167a7589aae5bba7c966843fc006da17050c9

diff --git a/src/spamserv.c b/src/spamserv.c
index 7d6d9b3..ddb3c16 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -289,7 +289,8 @@ spamserv_cs_move_merge(struct userNode *user, struct chanNode *channel, struct c
 		else
 			snprintf(reason, sizeof(reason), "$X (channel %s) merged into %s by %s.", channel->name, target->name, user->handle_info->handle);
 
-		global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+		/*global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);*/
+		spamserv_oper_message("%s", reason);
 		return 1;
 	}
 
@@ -325,7 +326,7 @@ spamserv_cs_unregister(struct userNode *user, struct chanNode *channel, enum cs_
 			spamserv_part_channel(channel, partmsg);
 		
 		spamserv_unregister_channel(cInfo);
-		global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, global);
+		spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
 	}
 }
 
@@ -1059,7 +1060,6 @@ static
 SPAMSERV_FUNC(cmd_register)
 {
 	struct chanInfo *cInfo;
-	char reason[MAXLEN];
 
 	if(!channel || !channel->channel_info)
 	{