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

diff --git a/src/spamserv.c b/src/spamserv.c
index f0ccca5..e2918c4 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -123,8 +123,6 @@ 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 +139,8 @@ static const struct message_entry msgtab[] = {
 #define SSMSG_WARNING_2               "You are violating the network rules"
 #define SSMSG_WARNING_RULES           "%s is against the network rules. Read the network rules at %s"
 #define SSMSG_WARNING_RULES_2         "You are violating the network rules. Read the network rules at %s"
+#define SSMSG_CHANNEL_REGISTERED      "%s (channel %s) registered by %s."
+#define SSMSG_CHANNEL_UNREGISTERED    "%s (channel %s) unregistered by %s."
 
 static struct
 {
@@ -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,10 @@ 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);
+		if(user)
+		{
+			spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
+		}
 	}
 }
 
@@ -575,7 +579,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 0;
+	}
         
     if(!CHECK_CHANOPS(cInfo))
 	{
@@ -1059,7 +1067,6 @@ static
 SPAMSERV_FUNC(cmd_register)
 {
 	struct chanInfo *cInfo;
-	char reason[MAXLEN];
 
 	if(!channel || !channel->channel_info)
 	{
@@ -1093,7 +1100,7 @@ SPAMSERV_FUNC(cmd_register)
 
 	spamserv_join_channel(cInfo->channel);
 	
-	spamserv_oper_message("SSMSG_CHANNEL_REGISTERED", spamserv->nick, channel->name, user->handle_info->handle);
+	spamserv_oper_message(SSMSG_CHANNEL_REGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
 	ss_reply("SSMSG_REG_SUCCESS", channel->name);
 
 	return 1;
@@ -1142,7 +1149,7 @@ SPAMSERV_FUNC(cmd_unregister)
 	
 	spamserv_unregister_channel(cInfo);	
 
-	spamserv_oper_message("SSMSG_CHANNEL_UNREGISTERED", spamserv->nick, channel->name, user->handle_info->handle);
+	spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
 	ss_reply("SSMSG_UNREG_SUCCESS", channel->name);
 
 	return 1;
@@ -1602,6 +1609,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);