X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fevent_neonserv_topic.c;h=577e0a349d3a45beb2fe6fafa7a8f0d2b882eaa2;hp=a2b99064c000da865c98ff170b4f377b930e41d2;hb=b013fcf166b6b84f7b946412dacfe84ba5cfe6b6;hpb=44436a96352a38631237978c9fd431cef3d85cfb diff --git a/src/event_neonserv_topic.c b/src/event_neonserv_topic.c index a2b9906..577e0a3 100644 --- a/src/event_neonserv_topic.c +++ b/src/event_neonserv_topic.c @@ -1,5 +1,5 @@ /* event_neonserv_topic.c - NeonServ v5.3 - * Copyright (C) 2011 Philipp Kreil (pk910) + * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -90,13 +90,14 @@ static void neonserv_event_topic_async1(struct ClientSocket *client, struct User //BOTWAR! chanuser->changeTime = time(0); if(chanuser->chageEvents > 0) { - putsock(client, "NOTICE @%s :%s %s", chan->name, get_language_string(user, "NS_BOTWAR_DETECTED"), (BOTWAR_ALERT_CHAN ? get_language_string(user, "NS_BOTWAR_REPORTED") : "")); - if(BOTWAR_ALERT_CHAN) { - struct ChanNode *alertchan = getChanByName(BOTWAR_ALERT_CHAN); + char *alertchan = get_string_field("General.alertchan"); + putsock(client, "NOTICE @%s :%s %s", chan->name, get_language_string(user, "NS_BOTWAR_DETECTED"), (alertchan ? get_language_string(user, "NS_BOTWAR_REPORTED") : "")); + if(alertchan) { + struct ChanNode *alertchan_chan = getChanByName(alertchan); struct ClientSocket *alertclient; - if(alertchan && (alertclient = getBotForChannel(chan)) != NULL) { + if(alertchan_chan && (alertclient = getBotForChannel(chan)) != NULL) { char msgBuf[MAXLEN]; - putsock(alertclient, "PRIVMSG %s :%s", alertchan->name, build_language_string(NULL, msgBuf, "NS_BOTWAR_ALERT", chan->name, user->nick)); + putsock(alertclient, "PRIVMSG %s :%s", alertchan_chan->name, build_language_string(NULL, msgBuf, "NS_BOTWAR_ALERT", chan->name, user->nick)); } } }