From: NurPech <nurpech@nurpech.de>
Date: Mon, 20 May 2013 22:10:51 +0000 (+0200)
Subject: fixed last commit fail
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=a6e170afa9f97346f5824a9b9fcfb153103b525d

fixed last commit fail
---

diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c
index e6bb84c..23b68c5 100644
--- a/src/mod-watchdog.c
+++ b/src/mod-watchdog.c
@@ -543,7 +543,7 @@ watchdog_conf_read(void)
     str = database_get_data(conf_node, "punishment_reason", RECDB_QSTRING);
 	watchdog_conf.punishment_reason = (str ? str : "Your message contained a forbidden word.");
 
-	str = database_get_data(conf_node, "alert_chan", RECDB_QSTRING);
+	str = database_get_data(conf_node, "alert_channel", RECDB_QSTRING);
 	if(str)
 	{
 		watchdog_conf.alert_channel = AddChannel(str, now, "+tinms", NULL);
@@ -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 38ffc0e..c6d73cd 100644
--- a/src/spamserv.c
+++ b/src/spamserv.c
@@ -1181,7 +1181,7 @@ SPAMSERV_FUNC(cmd_unregister)
 	
 	spamserv_unregister_channel(cInfo);	
 
-	spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, 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;