From: Stricted <info@nexus-irc.de>
Date: Sun, 23 Jun 2013 23:23:20 +0000 (+0200)
Subject: fixed fail from NurPech
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=95ca19dd93fa5ef8d8756d0ef0ec1c39fe398650

fixed fail from NurPech

fixed fail from NurPech
---

diff --git a/src/chanserv.c b/src/chanserv.c
index 19a5c57..a2f6175 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1523,7 +1523,7 @@ unregister_channel(struct chanData *channel, const char *reason)
     if(channel->expiry)
         timeq_del(channel->expiry, chanserv_expire_channel, channel, 0);
     channel->channel->channel_info = NULL;
-
+    sprintf(msgbuf, "%s %s", channel->channel->name, reason);
     dict_delete(channel->notes);
     if(!IsSuspended(channel))
         DelChannelUser(chanserv, channel->channel, msgbuf, 0);
@@ -2168,7 +2168,6 @@ static CHANSERV_FUNC(cmd_register)
     struct handle_info *handle;
     struct chanData *cData;
     struct modeNode *mn;
-    char reason[MAXLEN];
     char *chan_name;
     unsigned int new_channel, force=0;
     struct do_not_register *dnr;
@@ -7988,7 +7987,7 @@ chanserv_conf_read(void)
     str = database_get_data(conf_node, "off_channel", RECDB_QSTRING);
     off_channel = str ? atoi(str) : 0;
 
-    str = database_get_data(conf_node, "oper_chan", RECDB_QSTRING);
+    str = database_get_data(conf_node, "oper_channel", RECDB_QSTRING);
 	if(str)
 	{
 		chanserv_conf.oper_channel = AddChannel(str, now, "+tinms", NULL);
diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c
index e6bb84c..0edf09d 100644
--- a/src/mod-watchdog.c
+++ b/src/mod-watchdog.c
@@ -553,7 +553,7 @@ watchdog_conf_read(void)
 		watchdog_conf.alert_channel = NULL;
 	}
     
-	str = database_get_data(conf_node, "oper_chan", RECDB_QSTRING);
+	str = database_get_data(conf_node, "oper_channel", RECDB_QSTRING);
 	if(str)
 	{
 		watchdog_conf.oper_channel = AddChannel(str, now, "+tinms", NULL);
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)
 	{