fixed last commit fail
authorNurPech <nurpech@nurpech.de>
Mon, 20 May 2013 22:10:51 +0000 (00:10 +0200)
committerNurPech <nurpech@nurpech.de>
Tue, 21 May 2013 17:18:27 +0000 (19:18 +0200)
src/mod-watchdog.c
src/spamserv.c

index e6bb84c8c56095930f633dd647cff7b7952ef078..23b68c55ac7d43887b6b252a66c40c0f205e1070 100644 (file)
@@ -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);
index 38ffc0eddfb0c8320b7ff587462f1d4d00362847..c6d73cd2ad21ed2a0c6409f084897300c87d423c 100644 (file)
@@ -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;