X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fspamserv.c;h=178818395a46ae011fcb9b0c48aac44e4080ce40;hb=5bbd945af96418ab4ced2e04cd98b07d6e3c9e71;hp=c6d73cd2ad21ed2a0c6409f084897300c87d423c;hpb=a6e170afa9f97346f5824a9b9fcfb153103b525d;p=srvx.git

diff --git a/src/spamserv.c b/src/spamserv.c
index c6d73cd..1788183 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -307,7 +307,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;
 	}
 
@@ -343,7 +344,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);
 	}
 }
 
@@ -593,7 +594,11 @@ spamserv_user_join(struct modeNode *mNode)
 
 	if(user->uplink->burst || !(cInfo = get_chanInfo(channel->name)) || !CHECK_JOINFLOOD(cInfo) || !(uInfo = get_userInfo(user->nick)))
 		return 0;
-        
+
+	if(IsOper(user))
+	{
+		return;
+	}
         
     if(!CHECK_CHANOPS(cInfo))
 	{
@@ -1098,7 +1103,6 @@ static
 SPAMSERV_FUNC(cmd_register)
 {
 	struct chanInfo *cInfo;
-	char reason[MAXLEN];
 
 	if(!channel || !channel->channel_info)
 	{
@@ -1946,6 +1950,11 @@ spamserv_channel_message(struct chanNode *channel, struct userNode *user, char *
 	if(!spamserv || quit_services || !GetUserMode(channel, spamserv) || !(cInfo = get_chanInfo(channel->name)) || !(uInfo = get_userInfo(user->nick)))
 		return;
 
+	if(IsOper(user))
+	{
+		return;
+	}
+
 	if(!CHECK_CHANOPS(cInfo))
 	{
 		struct modeNode *mn = GetUserMode(channel, user);