diff options
Diffstat (limited to 'modules')
81 files changed, 400 insertions, 360 deletions
diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp index 34251cbb2..d52dbdb78 100644 --- a/modules/core/bs_act.cpp +++ b/modules/core/bs_act.cpp @@ -49,8 +49,10 @@ class CommandBSAct : public Command ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); ci->bi->lastmsg = time(NULL); - if (Config->LogBot && !Config->LogChannel.empty() && LogChan && !debug && findchan(Config->LogChannel)) - ircdproto->SendPrivmsg(ci->bi, Config->LogChannel, "ACT %s %s %s", u->nick.c_str(), ci->name.c_str(), message.c_str()); + + // XXX Need to be able to find if someone is overriding this. + Log(LOG_COMMAND, u, this, ci) << message; + return MOD_CONT; } diff --git a/modules/core/bs_assign.cpp b/modules/core/bs_assign.cpp index b1242c857..97b23c0ef 100644 --- a/modules/core/bs_assign.cpp +++ b/modules/core/bs_assign.cpp @@ -59,6 +59,9 @@ class CommandBSAssign : public Command return MOD_CONT; } + bool override = !check_access(u, ci, CA_ASSIGN); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << bi->nick; + bi->Assign(u, ci); notice_lang(Config->s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick.c_str(), ci->name.c_str()); return MOD_CONT; diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp index 46b38bf1d..c02ff6570 100644 --- a/modules/core/bs_badwords.cpp +++ b/modules/core/bs_badwords.cpp @@ -53,10 +53,14 @@ class BadwordsDelCallback : public NumberList { User *u; ChannelInfo *ci; + Command *c; unsigned Deleted; + bool override; public: - BadwordsDelCallback(User *_u, ChannelInfo *_ci, const Anope::string &list) : NumberList(list, true), u(_u), ci(_ci), Deleted(0) + BadwordsDelCallback(User *_u, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), u(_u), ci(_ci), c(_c), Deleted(0), override(false) { + if (!check_access(u, ci, CA_BADWORDS) && u->Account()->HasPriv("botserv/administration")) + this->override = true; } ~BadwordsDelCallback() @@ -74,6 +78,7 @@ class BadwordsDelCallback : public NumberList if (Number > ci->GetBadWordCount()) return; + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "DEL " << ci->GetBadWord(Number -1 )->word; ++Deleted; ci->EraseBadWord(Number - 1); } @@ -84,6 +89,9 @@ class CommandBSBadwords : public Command private: CommandReturn DoList(User *u, ChannelInfo *ci, const Anope::string &word) { + bool override = !check_access(u, ci, CA_BADWORDS); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "LIST"; + if (!ci->GetBadWordCount()) notice_lang(Config->s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name.c_str()); else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos) @@ -156,6 +164,8 @@ class CommandBSBadwords : public Command } } + bool override = !check_access(u, ci, CA_BADWORDS); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << realword; ci->AddBadWord(realword, type); notice_lang(Config->s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name.c_str()); @@ -168,7 +178,7 @@ class CommandBSBadwords : public Command /* Special case: is it a number/list? Only do search if it isn't. */ if (!word.empty() && isdigit(word[0]) && word.find_first_not_of("1234567890,-") == Anope::string::npos) { - BadwordsDelCallback list(u, ci, word); + BadwordsDelCallback list(u, ci, this, word); list.Process(); } else @@ -190,6 +200,8 @@ class CommandBSBadwords : public Command return MOD_CONT; } + bool override = !check_access(u, ci, CA_BADWORDS); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << badword->word; ci->EraseBadWord(i); notice_lang(Config->s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name.c_str()); @@ -200,6 +212,9 @@ class CommandBSBadwords : public Command CommandReturn DoClear(User *u, ChannelInfo *ci) { + bool override = !check_access(u, ci, CA_BADWORDS); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR"; + ci->ClearBadWords(); notice_lang(Config->s_BotServ, u, BOT_BADWORDS_CLEAR); return MOD_CONT; diff --git a/modules/core/bs_bot.cpp b/modules/core/bs_bot.cpp index f001c81a4..5c96ac70c 100644 --- a/modules/core/bs_bot.cpp +++ b/modules/core/bs_bot.cpp @@ -95,10 +95,13 @@ class CommandBSBot : public Command if (!(bi = new BotInfo(nick, user, host, real))) { + // XXX this cant happen? notice_lang(Config->s_BotServ, u, BOT_BOT_CREATION_FAILED); return MOD_CONT; } + Log(LOG_ADMIN, u, this) << "ADD " << bi->GetMask() << " " << bi->realname; + notice_lang(Config->s_BotServ, u, BOT_BOT_ADDED, bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); FOREACH_MOD(I_OnBotCreate, OnBotCreate(bi)); @@ -260,6 +263,7 @@ class CommandBSBot : public Command } notice_lang(Config->s_BotServ, u, BOT_BOT_CHANGED, oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); + Log(LOG_ADMIN, u, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname; FOREACH_MOD(I_OnBotChange, OnBotChange(bi)); return MOD_CONT; @@ -294,6 +298,8 @@ class CommandBSBot : public Command XLine x(bi->nick); ircdproto->SendSQLineDel(&x); + Log(LOG_ADMIN, u, this) << "DEL " << bi->nick; + delete bi; notice_lang(Config->s_BotServ, u, BOT_BOT_DELETED, nick.c_str()); return MOD_CONT; diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp index 849efb7d0..2ed3c8639 100644 --- a/modules/core/bs_kick.cpp +++ b/modules/core/bs_kick.cpp @@ -42,6 +42,9 @@ class CommandBSKick : public Command notice_help(Config->s_BotServ, u, BOT_NOT_ASSIGNED); else { + bool override = !check_access(u, ci, CA_SET); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << option << " " << value; + if (option.equals_ci("BADWORDS")) { if (value.equals_ci("ON")) @@ -54,7 +57,7 @@ class CommandBSKick : public Command if (!error.empty() || ci->ttb[TTB_BADWORDS] < 0) { /* leaving the debug behind since we might want to know what these are */ - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BADWORDS]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BADWORDS]; /* reset the value back to 0 - TSL */ ci->ttb[TTB_BADWORDS] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); @@ -85,7 +88,7 @@ class CommandBSKick : public Command ci->ttb[TTB_BOLDS] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_BOLDS] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BOLDS]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BOLDS]; ci->ttb[TTB_BOLDS] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -118,7 +121,7 @@ class CommandBSKick : public Command ci->ttb[TTB_CAPS] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_CAPS] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_CAPS]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_CAPS]; ci->ttb[TTB_CAPS] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -163,7 +166,7 @@ class CommandBSKick : public Command ci->ttb[TTB_COLORS] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_COLORS] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_COLORS]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_COLORS]; ci->ttb[TTB_COLORS] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -196,7 +199,7 @@ class CommandBSKick : public Command ci->ttb[TTB_FLOOD] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_FLOOD] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_FLOOD]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_FLOOD]; ci->ttb[TTB_FLOOD] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -243,7 +246,7 @@ class CommandBSKick : public Command ci->ttb[TTB_REPEAT] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_REPEAT] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REPEAT]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REPEAT]; ci->ttb[TTB_REPEAT] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -281,7 +284,7 @@ class CommandBSKick : public Command ci->ttb[TTB_REVERSES] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_REVERSES] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REVERSES]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REVERSES]; ci->ttb[TTB_REVERSES] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -311,7 +314,7 @@ class CommandBSKick : public Command ci->ttb[TTB_UNDERLINES] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_UNDERLINES] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_UNDERLINES]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_UNDERLINES]; ci->ttb[TTB_UNDERLINES] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; @@ -341,7 +344,7 @@ class CommandBSKick : public Command ci->ttb[TTB_ITALICS] = convertTo<int16>(ttb, error, false); if (!error.empty() || ci->ttb[TTB_ITALICS] < 0) { - Alog(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_ITALICS]; + Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_ITALICS]; ci->ttb[TTB_ITALICS] = 0; notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp index 1b799c415..916cf8fca 100644 --- a/modules/core/bs_say.cpp +++ b/modules/core/bs_say.cpp @@ -55,8 +55,10 @@ class CommandBSSay : public Command ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text.c_str()); ci->bi->lastmsg = time(NULL); - if (Config->LogBot && !Config->LogChannel.empty() && LogChan && !debug && findchan(Config->LogChannel)) - ircdproto->SendPrivmsg(ci->bi, Config->LogChannel, "SAY %s %s %s", u->nick.c_str(), ci->name.c_str(), text.c_str()); + + // XXX need a way to find if someone is overriding this + Log(LOG_COMMAND, u, this, ci) << text; + return MOD_CONT; } diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp index 87a15cf66..0ee46a0d5 100644 --- a/modules/core/bs_set.cpp +++ b/modules/core/bs_set.cpp @@ -64,6 +64,9 @@ class CommandBSSet : public Command notice_lang(Config->s_BotServ, u, ACCESS_DENIED); else { + bool override = !check_access(u, ci, CA_SET); + Log(override ? LOG_ADMIN : LOG_COMMAND, u, this, ci) << option << value; + if (option.equals_ci("DONTKICKOPS")) { if (value.equals_ci("ON")) diff --git a/modules/core/bs_unassign.cpp b/modules/core/bs_unassign.cpp index bde37f78e..6b6b28fe9 100644 --- a/modules/core/bs_unassign.cpp +++ b/modules/core/bs_unassign.cpp @@ -36,6 +36,9 @@ class CommandBSUnassign : public Command notice_help(Config->s_BotServ, u, BOT_UNASSIGN_PERSISTANT_CHAN); else { + bool override = !check_access(u, ci, CA_ASSIGN); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << ci->bi->nick; + ci->bi->UnAssign(u, ci); notice_lang(Config->s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name.c_str()); } diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp index 5fea57486..c6714cf05 100644 --- a/modules/core/cs_access.cpp +++ b/modules/core/cs_access.cpp @@ -108,12 +108,16 @@ class AccessDelCallback : public NumberList { User *u; ChannelInfo *ci; + Command *c; unsigned Deleted; Anope::string Nicks; bool Denied; + bool override; public: - AccessDelCallback(User *_u, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, true), u(_u), ci(_ci), Deleted(0), Denied(false) + AccessDelCallback(User *_u, ChannelInfo *_ci, Command *_c, const Anope::string &numlist) : NumberList(numlist, true), u(_u), ci(_ci), c(_c), Deleted(0), Denied(false) { + if (!check_access(u, ci, CA_ACCESS_CHANGE) && u->Account()->HasPriv("chanserv/access/modify")) + this->override = true; } ~AccessDelCallback() @@ -124,7 +128,7 @@ class AccessDelCallback : public NumberList notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); else { - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << get_access(u, ci) << ") deleted access of user" << (Deleted == 1 ? " " : "s ") << Nicks << " on " << ci->name; + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "for user" << (Deleted == 1 ? " " : "s ") << Nicks; if (Deleted == 1) notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name.c_str()); @@ -183,6 +187,8 @@ class CommandCSAccess : public Command return MOD_CONT; } + bool override = !check_access(u, ci, CA_ACCESS_CHANGE) || level >= ulev; + NickAlias *na = findnick(nick); if (!na) { @@ -214,7 +220,7 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nc, level)); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << ulev << ") set access level " << access->level << " to " << na->nick << " (group " << nc->display << ") on channel " << ci->name; + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << na->nick << "(group: " << nc->display << ") as level " << ulev; notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display.c_str(), ci->name.c_str(), level); return MOD_CONT; } @@ -229,7 +235,7 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, nc, level)); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << ulev << ") set access level " << level << " to " << na->nick << " (group " << nc->display << ") on channel " << ci->name; + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << na->nick << "(group: " << nc->display << ") as level " << ulev; notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display.c_str(), ci->name.c_str(), level); return MOD_CONT; @@ -243,7 +249,7 @@ class CommandCSAccess : public Command notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); else if (isdigit(nick[0]) && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { - AccessDelCallback list(u, ci, nick); + AccessDelCallback list(u, ci, this, nick); list.Process(); } else @@ -274,7 +280,9 @@ class CommandCSAccess : public Command else { notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display.c_str(), ci->name.c_str()); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << get_access(u, ci) << ") deleted access of " << na->nick << " (group " << access->nc->display << ") on " << ci->name; + bool override = !check_access(u, ci, CA_ACCESS_CHANGE); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << na->nick << "(group: " << access->nc->display << ") from level " << access->level; + FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, na->nc)); ci->EraseAccess(i); @@ -375,7 +383,9 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name.c_str()); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << get_access(u, ci) << " cleared access list on " << ci->name; + + bool override = !IsFounder(u, ci); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR"; } return MOD_CONT; @@ -471,7 +481,10 @@ class CommandCSLevels : public Command { ci->levels[levelinfo[i].what] = level; FOREACH_MOD(I_OnLevelChange, OnLevelChange(u, ci, i, level)); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " set level " << levelinfo[i].name << " on channel " << ci->name << " to " << level; + + bool override = !check_access(u, ci, CA_FOUNDER); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "SET " << levelinfo[i].name << " to " << level; + if (level == ACCESS_FOUNDER) notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_CHANGED_FOUNDER, levelinfo[i].name.c_str(), ci->name.c_str()); else @@ -498,7 +511,9 @@ class CommandCSLevels : public Command ci->levels[levelinfo[i].what] = ACCESS_INVALID; FOREACH_MOD(I_OnLevelChange, OnLevelChange(u, ci, i, levelinfo[i].what)); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " disabled level " << levelinfo[i].name << " on channel " << ci->name; + bool override = !check_access(u, ci, CA_FOUNDER); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DISABLE " << levelinfo[i].name; + notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_DISABLED, levelinfo[i].name.c_str(), ci->name.c_str()); return MOD_CONT; } @@ -547,7 +562,10 @@ class CommandCSLevels : public Command { reset_levels(ci); FOREACH_MOD(I_OnLevelChange, OnLevelChange(u, ci, -1, 0)); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " reset levels definitions on channel " << ci->name; + + bool override = !check_access(u, ci, CA_FOUNDER); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "RESET"; + notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_RESET, ci->name.c_str()); return MOD_CONT; } diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp index c3d3c77b5..5df1a9038 100644 --- a/modules/core/cs_akick.cpp +++ b/modules/core/cs_akick.cpp @@ -138,14 +138,18 @@ class AkickDelCallback : public NumberList { User *u; ChannelInfo *ci; + Command *c; unsigned Deleted; public: - AkickDelCallback(User *_u, ChannelInfo *_ci, const Anope::string &list) : NumberList(list, true), u(_u), ci(_ci), Deleted(0) + AkickDelCallback(User *_u, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), u(_u), ci(_ci), c(_c), Deleted(0) { } ~AkickDelCallback() { + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "DEL on " << Deleted << " users"; + if (!Deleted) notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); else if (Deleted == 1) @@ -266,6 +270,9 @@ class CommandCSAKick : public Command else akick = ci->AddAkick(u->nick, mask, reason); + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << mask << ": " << reason; + FOREACH_MOD(I_OnAkickAdd, OnAkickAdd(u, ci, akick)); notice_lang(Config->s_ChanServ, u, CHAN_AKICK_ADDED, mask.c_str(), ci->name.c_str()); @@ -306,6 +313,9 @@ class CommandCSAKick : public Command return; } + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "STICK " << akick->mask; + akick->SetFlag(AK_STUCK); notice_lang(Config->s_ChanServ, u, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name.c_str()); @@ -346,6 +356,9 @@ class CommandCSAKick : public Command return; } + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "UNSTICK " << akick->mask; + akick->UnsetFlag(AK_STUCK); notice_lang(Config->s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name.c_str()); } @@ -365,7 +378,7 @@ class CommandCSAKick : public Command /* Special case: is it a number/list? Only do search if it isn't. */ if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos) { - AkickDelCallback list(u, ci, mask); + AkickDelCallback list(u, ci, this, mask); list.Process(); } else @@ -387,6 +400,9 @@ class CommandCSAKick : public Command return; } + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << mask; + ci->EraseAkick(i); notice_lang(Config->s_ChanServ, u, CHAN_AKICK_DELETED, mask.c_str(), ci->name.c_str()); @@ -397,6 +413,9 @@ class CommandCSAKick : public Command { Anope::string mask = params.size() > 2 ? params[2] : ""; + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "LIST"; + if (!ci->GetAkickCount()) { notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); @@ -442,6 +461,9 @@ class CommandCSAKick : public Command { Anope::string mask = params.size() > 2 ? params[2] : ""; + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "VIEW"; + if (!ci->GetAkickCount()) { notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); @@ -502,11 +524,17 @@ class CommandCSAKick : public Command ++count; } + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ENFORCE, affects " << count << " users"; + notice_lang(Config->s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, ci->name.c_str(), count); } void DoClear(User *u, ChannelInfo *ci) { + bool override = !check_access(u, ci, CA_AKICK); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR"; + ci->ClearAkick(); notice_lang(Config->s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name.c_str()); } diff --git a/modules/core/cs_ban.cpp b/modules/core/cs_ban.cpp index 500db20f5..fcc11d393 100644 --- a/modules/core/cs_ban.cpp +++ b/modules/core/cs_ban.cpp @@ -56,8 +56,11 @@ class CommandCSBan : public Command else { Anope::string mask; - get_idealban(ci, u2, mask); + + // XXX need a way to detect if someone is overriding + Log(LOG_COMMAND, u, this, ci) << "for " << mask; + c->SetMode(NULL, CMODE_BAN, mask); /* We still allow host banning while not allowing to kick */ diff --git a/modules/core/cs_clear.cpp b/modules/core/cs_clear.cpp index 42a9bd53a..1fa61fc56 100644 --- a/modules/core/cs_clear.cpp +++ b/modules/core/cs_clear.cpp @@ -34,9 +34,13 @@ class CommandCSClear : public Command ChannelMode *halfop = ModeManager::FindChannelModeByName(CMODE_HALFOP); ChannelMode *voice = ModeManager::FindChannelModeByName(CMODE_VOICE); + if (c) + // XXX + Log(LOG_COMMAND, u, this, ci) << what; + if (!c) notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); - else if (!u || !check_access(u, ci, CA_CLEAR)) + else if (!check_access(u, ci, CA_CLEAR)) notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); else if (what.equals_ci("bans")) { diff --git a/modules/core/cs_drop.cpp b/modules/core/cs_drop.cpp index 608fe3664..4ac066927 100644 --- a/modules/core/cs_drop.cpp +++ b/modules/core/cs_drop.cpp @@ -53,8 +53,6 @@ class CommandCSDrop : public Command return MOD_CONT; } - int level = get_access(u, ci); - if (ci->c && ModeManager::FindChannelModeByName(CMODE_REGISTERED)) ci->c->RemoveMode(NULL, CMODE_REGISTERED, "", false); @@ -64,16 +62,13 @@ class CommandCSDrop : public Command ircdproto->SendSQLineDel(&x); } - Alog() << Config->s_ChanServ << ": Channel " << ci->name << " dropped by " << u->GetMask() << " (founder: " << (ci->founder ? ci->founder->display : "(none)") << ")"; + bool override = (ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER)); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "founder: " << (ci->founder ? ci->founder->display : "none"); + if (override) + ircdproto->SendGlobops(ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); delete ci; - /* We must make sure that the Services admin has not normally the right to - * drop the channel before issuing the wallops. - */ - if (Config->WallDrop && (level < ACCESS_FOUNDER || (!IsFounder(u, ci) && ci->HasFlag(CI_SECUREFOUNDER)))) - ircdproto->SendGlobops(ChanServ, "\2%s\2 used DROP on channel \2%s\2", u->nick.c_str(), chan.c_str()); - notice_lang(Config->s_ChanServ, u, CHAN_DROPPED, chan.c_str()); FOREACH_MOD(I_OnChanDrop, OnChanDrop(chan)); diff --git a/modules/core/cs_forbid.cpp b/modules/core/cs_forbid.cpp index 09fddd091..706d5e4a8 100644 --- a/modules/core/cs_forbid.cpp +++ b/modules/core/cs_forbid.cpp @@ -53,7 +53,8 @@ class CommandCSForbid : public Command ci = new ChannelInfo(chan); if (!ci) { - Alog() << Config->s_ChanServ << ": Valid FORBID for " << ci->name << " by " << u->nick << " failed"; + // this cant happen? + //Alog() << Config->s_ChanServ << ": Valid FORBID for " << ci->name << " by " << u->nick << " failed"; notice_lang(Config->s_ChanServ, u, CHAN_FORBID_FAILED, chan.c_str()); return MOD_CONT; } @@ -80,16 +81,16 @@ class CommandCSForbid : public Command } } - if (Config->WallForbid) - ircdproto->SendGlobops(ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); - if (ircd->chansqline) { XLine x(chan, "Forbidden"); ircdproto->SendSQLine(&x); } - Alog() << Config->s_ChanServ << ": " << u->nick << " set FORBID for channel " << ci->name; + if (Config->WallForbid) + ircdproto->SendGlobops(ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); + Log(LOG_ADMIN, u, this, ci) << (!ci->forbidreason.empty() ? ci->forbidreason : "No reason"); + notice_lang(Config->s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan.c_str()); FOREACH_MOD(I_OnChanForbidden, OnChanForbidden(ci)); diff --git a/modules/core/cs_getkey.cpp b/modules/core/cs_getkey.cpp index c39000ea3..a3e80b424 100644 --- a/modules/core/cs_getkey.cpp +++ b/modules/core/cs_getkey.cpp @@ -40,6 +40,9 @@ class CommandCSGetKey : public Command return MOD_CONT; } + bool override = !check_access(u, ci, CA_GETKEY); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci); + notice_lang(Config->s_ChanServ, u, CHAN_GETKEY_KEY, chan.c_str(), key.c_str()); return MOD_CONT; } diff --git a/modules/core/cs_invite.cpp b/modules/core/cs_invite.cpp index 926375b3e..c841627a9 100644 --- a/modules/core/cs_invite.cpp +++ b/modules/core/cs_invite.cpp @@ -35,7 +35,7 @@ class CommandCSInvite : public Command ci = c->ci; - if (!u || !check_access(u, ci, CA_INVITE)) + if (!check_access(u, ci, CA_INVITE)) { notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; @@ -52,6 +52,9 @@ class CommandCSInvite : public Command } } + // XXX need a check for override... + Log(LOG_COMMAND, u, this, ci) << "for " << u2->nick; + if (c->FindUser(u2)) notice_lang(Config->s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name.c_str()); else diff --git a/modules/core/cs_kick.cpp b/modules/core/cs_kick.cpp index 06f0004b8..4deb19b13 100644 --- a/modules/core/cs_kick.cpp +++ b/modules/core/cs_kick.cpp @@ -51,6 +51,9 @@ class CommandCSKick : public Command notice_lang(Config->s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); else { + // XXX + Log(LOG_COMMAND, u, this, ci) << "for " << u2->nick; + if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !check_access(u, ci, CA_SIGNKICK))) ci->c->Kick(whosends(ci), u2, "%s (%s)", reason.c_str(), u->nick.c_str()); else diff --git a/modules/core/cs_modes.cpp b/modules/core/cs_modes.cpp index 274c7e5af..54bc09d11 100644 --- a/modules/core/cs_modes.cpp +++ b/modules/core/cs_modes.cpp @@ -15,6 +15,7 @@ /** do_util: not a command, but does the job of others * @param u The user doing the command + * @param com The command calling this function * @param cm A channel mode class * @param chan The channel its being set on * @param nick The nick the modes being set on @@ -24,22 +25,14 @@ * @param name The name, eg "OP" or "HALFOP" * @param notice Flag required on a channel to send a notice */ -static CommandReturn do_util(User *u, ChannelMode *cm, const Anope::string &chan, const Anope::string &nick, bool set, int level, int levelself, const Anope::string &name, ChannelInfoFlag notice) +static CommandReturn do_util(User *u, Command *com, ChannelMode *cm, const Anope::string &chan, const Anope::string &nick, bool set, int level, int levelself, const Anope::string &name, ChannelInfoFlag notice) { Channel *c = findchan(chan); - ChannelInfo *ci; + ChannelInfo *ci = c ? c->ci : NULL; User *u2; - Anope::string realnick = nick; - int is_same; - - if (realnick.empty()) - realnick = u->nick; - - is_same = u->nick.equals_cs(realnick) ? 1 : u->nick.equals_ci(realnick); - - if (c) - ci = c->ci; + Anope::string realnick = (!nick.empty() ? nick : u->nick); + bool is_same = u->nick.equals_ci(realnick); if (!c) notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); @@ -60,6 +53,7 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const Anope::string &chan else c->RemoveMode(NULL, cm, u2->nick); + Log(LOG_COMMAND, u, com, ci) << "for " << u2->nick; if (notice && ci->HasFlag(notice)) ircdproto->SendMessage(whosends(ci), c->name, "%s command used for %s by %s", name.c_str(), u2->nick.c_str(), u->nick.c_str()); } @@ -78,7 +72,7 @@ class CommandCSOp : public Command { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP); - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, CA_OPDEOP, CA_OPDEOPME, "OP", CI_OPNOTICE); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", true, CA_OPDEOP, CA_OPDEOPME, "OP", CI_OPNOTICE); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -109,7 +103,7 @@ class CommandCSDeOp : public Command { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP); - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, CA_OPDEOP, CA_OPDEOPME, "DEOP", CI_OPNOTICE); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", false, CA_OPDEOP, CA_OPDEOPME, "DEOP", CI_OPNOTICE); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -140,7 +134,7 @@ class CommandCSVoice : public Command { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE); - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, CA_VOICE, CA_VOICEME, "VOICE", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", true, CA_VOICE, CA_VOICEME, "VOICE", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -171,7 +165,7 @@ class CommandCSDeVoice : public Command { ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE); - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, CA_VOICE, CA_VOICEME, "DEVOICE", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", false, CA_VOICE, CA_VOICEME, "DEVOICE", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -207,7 +201,7 @@ class CommandCSHalfOp : public Command return MOD_CONT; } - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, CA_HALFOP, CA_HALFOPME, "HALFOP", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", true, CA_HALFOP, CA_HALFOPME, "HALFOP", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -241,7 +235,7 @@ class CommandCSDeHalfOp : public Command if (!cm) return MOD_CONT; - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, CA_HALFOP, CA_HALFOPME, "DEHALFOP", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", false, CA_HALFOP, CA_HALFOPME, "DEHALFOP", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -275,7 +269,7 @@ class CommandCSProtect : public Command if (!cm) return MOD_CONT; - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, CA_PROTECT, CA_PROTECTME, "PROTECT", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", true, CA_PROTECT, CA_PROTECTME, "PROTECT", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -309,7 +303,7 @@ class CommandCSDeProtect : public Command if (!cm) return MOD_CONT; - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, CA_PROTECT, CA_PROTECTME, "DEPROTECT", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", false, CA_PROTECT, CA_PROTECTME, "DEPROTECT", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -343,7 +337,7 @@ class CommandCSOwner : public Command if (!cm) return MOD_CONT; - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, CA_OWNER, CA_OWNERME, "OWNER", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", true, CA_OWNER, CA_OWNERME, "OWNER", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) @@ -377,7 +371,7 @@ class CommandCSDeOwner : public Command if (!cm) return MOD_CONT; - return do_util(u, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, CA_OWNER, CA_OWNERME, "DEOWNER", CI_BEGIN); + return do_util(u, this, cm, params[0], params.size() > 1 ? params[1] : "", false, CA_OWNER, CA_OWNERME, "DEOWNER", CI_BEGIN); } bool OnHelp(User *u, const Anope::string &subcommand) diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp index 70a436fa5..545f3f5a1 100644 --- a/modules/core/cs_register.cpp +++ b/modules/core/cs_register.cpp @@ -49,16 +49,12 @@ class CommandCSRegister : public Command notice_lang(Config->s_ChanServ, u, u->Account()->channelcount > Config->CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg); else if (!(ci = new ChannelInfo(chan))) { - Alog() << Config->s_ChanServ << ": makechan() failed for REGISTER " << chan; + // not possible ? + //Alog() << Config->s_ChanServ << ": makechan() failed for REGISTER " << chan; notice_lang(Config->s_ChanServ, u, CHAN_REGISTRATION_FAILED); } else { - if (c) - { - c->ci = ci; - ci->c = c; - } ci->founder = u->Account(); ci->desc = desc; @@ -73,7 +69,7 @@ class CommandCSRegister : public Command ci->bi = NULL; ++ci->founder->channelcount; - Alog() << Config->s_ChanServ << ": Channel '" << chan << "' registered by " << u->GetMask(); + Log(LOG_COMMAND, u, this, ci); notice_lang(Config->s_ChanServ, u, CHAN_REGISTERED, chan.c_str(), u->nick.c_str()); /* Implement new mode lock */ diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp index 61ae2f299..923848e7a 100644 --- a/modules/core/cs_saset.cpp +++ b/modules/core/cs_saset.cpp @@ -40,9 +40,11 @@ class CommandCSSASet : public Command if (c) { - Anope::string cmdparams = cs_findchan(params[0])->name; + ChannelInfo *ci = cs_findchan(params[0]); + Anope::string cmdparams = ci->name; for (std::vector<Anope::string>::const_iterator it = params.begin() + 2, it_end = params.end(); it != it_end; ++it) cmdparams += " " + *it; + Log(LOG_ADMIN, u, this, ci) << params[1] << " " << cmdparams; mod_run_cmd(ChanServ, u, c, params[1], cmdparams); } else diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp index dd2063ffe..ede39c3c7 100644 --- a/modules/core/cs_set.cpp +++ b/modules/core/cs_set.cpp @@ -45,7 +45,8 @@ class CommandCSSet : public Command if (c) { - Anope::string cmdparams = cs_findchan(params[0])->name; + ChannelInfo *ci = cs_findchan(params[0]); + Anope::string cmdparams = ci->name; for (std::vector<Anope::string>::const_iterator it = params.begin() + 2, it_end = params.end(); it != it_end; ++it) cmdparams += " " + *it; mod_run_cmd(ChanServ, u, c, params[1], cmdparams); diff --git a/modules/core/cs_set_founder.cpp b/modules/core/cs_set_founder.cpp index b6af6220a..ee955d590 100644 --- a/modules/core/cs_set_founder.cpp +++ b/modules/core/cs_set_founder.cpp @@ -53,7 +53,7 @@ class CommandCSSetFounder : public Command return MOD_CONT; } - Alog() << Config->s_ChanServ << ": Changing founder of " << ci->name << " from " << ci->founder->display << " to " << nc->display << " by " << u->GetMask(); + Log(!this->permission.empty() ? LOG_ADMIN : LOG_COMMAND, u, this, ci) << "to change the founder to " << nc->display; /* Founder and successor must not be the same group */ if (nc == ci->successor) diff --git a/modules/core/cs_set_successor.cpp b/modules/core/cs_set_successor.cpp index 7478651c4..b4e0972c6 100644 --- a/modules/core/cs_set_successor.cpp +++ b/modules/core/cs_set_successor.cpp @@ -58,7 +58,7 @@ class CommandCSSetSuccessor : public Command else nc = NULL; - Alog() << Config->s_ChanServ << ": Changing successor of " << ci->name << " from " << (ci->successor ? ci->successor->display : "none") << " to " << (nc ? nc->display : "none") << " by " << u->GetMask(); + Log(!this->permission.empty() ? LOG_ADMIN : LOG_COMMAND, u, this, ci) << "to change the successor from " << (ci->successor ? ci->successor->display : "none") << " to " << (nc ? nc->display : "none"); ci->successor = nc; diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp index 18e4df76d..e08b014a1 100644 --- a/modules/core/cs_set_xop.cpp +++ b/modules/core/cs_set_xop.cpp @@ -64,14 +64,14 @@ class CommandCSSetXOP : public Command ci->SetFlag(CI_XOP); } - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " enabled XOP for " << ci->name; + Log(LOG_COMMAND, u, this, ci) << "to enable XOP"; notice_lang(Config->s_ChanServ, u, CHAN_SET_XOP_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_XOP); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " disabled XOP for " << ci->name; + Log(LOG_COMMAND, u, this, ci) << "to disable XOP"; notice_lang(Config->s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name.c_str()); } else diff --git a/modules/core/cs_suspend.cpp b/modules/core/cs_suspend.cpp index 7af933a69..055b8b0e7 100644 --- a/modules/core/cs_suspend.cpp +++ b/modules/core/cs_suspend.cpp @@ -74,14 +74,15 @@ class CommandCSSuspend : public Command if (Config->WallForbid) ircdproto->SendGlobops(ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " set SUSPEND for channel " << ci->name; + Log(LOG_ADMIN, u, this, ci) << (!reason.empty() ? reason : "No reason"); notice_lang(Config->s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan.c_str()); FOREACH_MOD(I_OnChanSuspend, OnChanSuspend(ci)); } else { - Alog() << Config->s_ChanServ << ": Valid SUSPEND for " << ci->name << " by " << u->GetMask() << " failed"; + // cant happen? + //Alog() << Config->s_ChanServ << ": Valid SUSPEND for " << ci->name << " by " << u->GetMask() << " failed"; notice_lang(Config->s_ChanServ, u, CHAN_SUSPEND_FAILED, chan.c_str()); } return MOD_CONT; @@ -134,6 +135,8 @@ class CommandCSUnSuspend : public Command if (ci) { + Log(LOG_ADMIN, u, this, ci) << " was suspended for: " << (!ci->forbidreason.empty() ? ci->forbidreason : "No reason"); + ci->UnsetFlag(CI_SUSPENDED); ci->forbidreason.clear(); ci->forbidby.clear(); @@ -141,14 +144,14 @@ class CommandCSUnSuspend : public Command if (Config->WallForbid) ircdproto->SendGlobops(ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " set UNSUSPEND for channel " << ci->name; notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan.c_str()); FOREACH_MOD(I_OnChanUnsuspend, OnChanUnsuspend(ci)); } else { - Alog() << Config->s_ChanServ << ": Valid UNSUSPEND for " << chan << " by " << u->nick << " failed"; + // cant happen ? + //Alog() << Config->s_ChanServ << ": Valid UNSUSPEND for " << chan << " by " << u->nick << " failed"; notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan.c_str()); } return MOD_CONT; diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp index 5a421e272..ebd09b385 100644 --- a/modules/core/cs_topic.cpp +++ b/modules/core/cs_topic.cpp @@ -25,11 +25,8 @@ class CommandCSTopic : public Command Anope::string chan = params[0]; Anope::string topic = params.size() > 1 ? params[1] : ""; - Channel *c; - ChannelInfo *ci; - - if ((c = findchan(chan))) - ci = c->ci; + ChannelInfo *ci = cs_findchan(params[0]); + Channel *c = ci->c; if (!c) notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); @@ -48,9 +45,10 @@ class CommandCSTopic : public Command else c->topic_time = ci->last_topic_time; - if (!check_access(u, ci, CA_TOPIC)) - Alog() << Config->s_NickServ << ": " << u->GetMask() << " changed topic of " << c->name << " as services admin."; - if (ircd->join2set && whosends(ci) == ChanServ) + bool override = !check_access(u, ci, CA_TOPIC); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to change the topic to " << (!topic.empty() ? topic : "No topic"); + + if (ircd->join2set && whosends(ci) == ChanServ) // XXX what if the service bot is chanserv? { ChanServ->Join(c); ircdproto->SendMode(NULL, c, "+o %s", Config->s_ChanServ.c_str()); // XXX diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp index 973febf0a..4ebec6926 100644 --- a/modules/core/cs_xop.cpp +++ b/modules/core/cs_xop.cpp @@ -150,11 +150,13 @@ class XOPDelCallback : public NumberList { User *u; ChannelInfo *ci; + Command *c; int *messages; unsigned Deleted; Anope::string Nicks; + bool override; public: - XOPDelCallback(User *_u, ChannelInfo *_ci, int *_messages, const Anope::string &numlist) : NumberList(numlist, true), u(_u), ci(_ci), messages(_messages), Deleted(0) + XOPDelCallback(User *_u, Command *_c, ChannelInfo *_ci, int *_messages, bool _override, const Anope::string &numlist) : NumberList(numlist, true), u(_u), ci(_ci), c(_c), messages(_messages), Deleted(0), override(_override) { } @@ -164,7 +166,7 @@ class XOPDelCallback : public NumberList notice_lang(Config->s_ChanServ, u, messages[XOP_NO_MATCH], ci->name.c_str()); else { - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << get_access(u, ci) << ") deleted access of users " << Nicks << " on " << ci->name; + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "deleted access of users " << Nicks; if (Deleted == 1) notice_lang(Config->s_ChanServ, u, messages[XOP_DELETED_ONE], ci->name.c_str()); @@ -263,7 +265,8 @@ class XOPBase : public Command access->creator = u->nick; } - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << ulev << ") " << (change ? "changed" : "set") << " access level " << level << " to " << na->nick << " (group " << nc->display << ") on channel " << ci->name; + bool override = (level >= ulev || ulev < ACCESS_AOP || (access && access->level > ulev)); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << na->nick << " (group: " << nc->display << ") as level " << level; if (!change) { @@ -313,7 +316,8 @@ class XOPBase : public Command /* Special case: is it a number/list? Only do search if it isn't. */ if (isdigit(nick[0]) && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { - XOPDelCallback list(u, ci, messages, nick); + bool override = level >= ulev || ulev < ACCESS_AOP; + XOPDelCallback list(u, this, ci, messages, override, nick); list.Process(); } else @@ -325,7 +329,6 @@ class XOPBase : public Command return MOD_CONT; } NickCore *nc = na->nc; - unsigned i, end; for (i = 0, end = ci->GetAccessCount(); i < end; ++i) { @@ -345,7 +348,8 @@ class XOPBase : public Command notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); else { - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " (level " << get_access(u, ci) << ") deleted access of user " << access->nc->display << " on " << ci->name; + bool override = ulev <= access->level; + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << access->nc->display; notice_lang(Config->s_ChanServ, u, messages[XOP_DELETED], access->nc->display.c_str(), ci->name.c_str()); @@ -368,6 +372,9 @@ class XOPBase : public Command return MOD_CONT; } + bool override = !get_access(u, ci); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci); + if (!ci->GetAccessCount()) { notice_lang(Config->s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); @@ -426,6 +433,9 @@ class XOPBase : public Command return MOD_CONT; } + bool override = !check_access(u, ci, CA_FOUNDER); + Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR level " << level; + for (unsigned i = ci->GetAccessCount(); i > 0; --i) { ChanAccess *access = ci->GetAccess(i - 1); diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index b05a1f896..6ac61ba11 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -46,7 +46,7 @@ static void ReadDatabase(Module *m = NULL) if (!db.is_open()) { - Alog() << "Unable to open " << DatabaseFile << " for reading!"; + Log() << "Unable to open " << DatabaseFile << " for reading!"; return; } @@ -132,7 +132,7 @@ static void ReadDatabase(Module *m = NULL) } catch (const DatabaseException &ex) { - Alog() << "[db_plain]: " << ex.GetReason(); + Log() << "[db_plain]: " << ex.GetReason(); } } else if (Type == MD_NA && na) @@ -146,7 +146,7 @@ static void ReadDatabase(Module *m = NULL) } catch (const DatabaseException &ex) { - Alog() << "[db_plain]: " << ex.GetReason(); + Log() << "[db_plain]: " << ex.GetReason(); } } else if (Type == MD_NR && nr) @@ -160,7 +160,7 @@ static void ReadDatabase(Module *m = NULL) } catch (const DatabaseException &ex) { - Alog() << "[db_plain]: " << ex.GetReason(); + Log() << "[db_plain]: " << ex.GetReason(); } } else if (Type == MD_BI && bi) @@ -174,7 +174,7 @@ static void ReadDatabase(Module *m = NULL) } catch (const DatabaseException &ex) { - Alog() << "[db_plain]: " << ex.GetReason(); + Log() << "[db_plain]: " << ex.GetReason(); } } else if (Type == MD_CH && ci) @@ -188,7 +188,7 @@ static void ReadDatabase(Module *m = NULL) } catch (const DatabaseException &ex) { - Alog() << "[db_plain]: " << ex.GetReason(); + Log() << "[db_plain]: " << ex.GetReason(); if (!ci->founder) { delete ci; @@ -362,7 +362,7 @@ static void LoadNickCore(const std::vector<Anope::string> ¶ms) nc->pass = params[1]; - Alog(LOG_DEBUG_2) << "[db_plain]: Loaded NickCore " << nc->display; + Log(LOG_DEBUG_2) << "[db_plain]: Loaded NickCore " << nc->display; } static void LoadNickAlias(const std::vector<Anope::string> ¶ms) @@ -370,7 +370,7 @@ static void LoadNickAlias(const std::vector<Anope::string> ¶ms) NickCore *nc = findcore(params[0]); if (!nc) { - Alog() << "[db_plain]: Unable to find core " << params[0]; + Log() << "[db_plain]: Unable to find core " << params[0]; return; } @@ -380,7 +380,7 @@ static void LoadNickAlias(const std::vector<Anope::string> ¶ms) na->last_seen = params[3].is_pos_number_only() ? convertTo<time_t>(params[3]) : 0; - Alog(LOG_DEBUG_2) << "[db_plain}: Loaded nickalias for " << na->nick; + Log(LOG_DEBUG_2) << "[db_plain}: Loaded nickalias for " << na->nick; } static void LoadNickRequest(const std::vector<Anope::string> ¶ms) @@ -391,21 +391,20 @@ static void LoadNickRequest(const std::vector<Anope::string> ¶ms) nr->email = params[3]; nr->requested = params[4].is_pos_number_only() ? convertTo<time_t>(params[4]) : 0; - Alog(LOG_DEBUG_2) << "[db_plain]: Loaded nickrequest for " << nr->nick; + Log(LOG_DEBUG_2) << "[db_plain]: Loaded nickrequest for " << nr->nick; } static void LoadBotInfo(const std::vector<Anope::string> ¶ms) { BotInfo *bi = findbot(params[0]); if (!bi) - bi = new BotInfo(params[0]); - bi->SetIdent(params[1]); - bi->host = params[2]; + bi = new BotInfo(params[0], params[1], params[2]); + bi->created = params[3].is_pos_number_only() ? convertTo<time_t>(params[3]) : 0; bi->chancount = params[4].is_pos_number_only() ? convertTo<uint32>(params[4]) : 0; bi->realname = params[5]; - Alog(LOG_DEBUG_2) << "[db_plain]: Loaded botinfo for " << bi->nick; + Log(LOG_DEBUG_2) << "[db_plain]: Loaded botinfo for " << bi->nick; } static void LoadChanInfo(const std::vector<Anope::string> ¶ms) @@ -421,7 +420,7 @@ static void LoadChanInfo(const std::vector<Anope::string> ¶ms) ci->last_used = params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0; - Alog(LOG_DEBUG_2) << "[db_plain]: loaded channel " << ci->name; + Log(LOG_DEBUG_2) << "[db_plain]: loaded channel " << ci->name; } static void LoadOperInfo(const std::vector<Anope::string> ¶ms) @@ -533,11 +532,11 @@ class DBPlain : public Module if (IsFile(newname)) return; - Alog(LOG_DEBUG) << "db_plain: Attemping to rename " << DatabaseFile << " to " << newname; + Log(LOG_DEBUG) << "db_plain: Attemping to rename " << DatabaseFile << " to " << newname; if (rename(DatabaseFile.c_str(), newname.c_str())) { ircdproto->SendGlobops(OperServ, "Unable to backup database!"); - Alog() << "Unable to back up database!"; + Log() << "Unable to back up database!"; if (!Config->NoBackupOkay) quitting = true; diff --git a/modules/core/enc_md5.cpp b/modules/core/enc_md5.cpp index e75c7afeb..b3a826c23 100644 --- a/modules/core/enc_md5.cpp +++ b/modules/core/enc_md5.cpp @@ -336,7 +336,7 @@ class EMD5 : public Module MD5Final(reinterpret_cast<unsigned char *>(digest), &context); buf += Anope::Hex(digest, 16); - Alog(LOG_DEBUG_2) << "(enc_md5) hashed password from [" << src << "] to [" << buf << "]"; + Log(LOG_DEBUG_2) << "(enc_md5) hashed password from [" << src << "] to [" << buf << "]"; dest = buf; return EVENT_ALLOW; } diff --git a/modules/core/enc_none.cpp b/modules/core/enc_none.cpp index 445dcb767..f27df4f1b 100644 --- a/modules/core/enc_none.cpp +++ b/modules/core/enc_none.cpp @@ -28,7 +28,7 @@ class ENone : public Module Anope::string cpass; b64_encode(src, cpass); buf += cpass; - Alog(LOG_DEBUG_2) << "(enc_none) hashed password from [" << src << "] to [" << buf << "]"; + Log(LOG_DEBUG_2) << "(enc_none) hashed password from [" << src << "] to [" << buf << "]"; dest = buf; return EVENT_ALLOW; } diff --git a/modules/core/enc_old.cpp b/modules/core/enc_old.cpp index 6a100fd85..2103426c1 100644 --- a/modules/core/enc_old.cpp +++ b/modules/core/enc_old.cpp @@ -346,7 +346,7 @@ class EOld : public Module digest2[i / 2] = XTOI(digest[i]) << 4 | XTOI(digest[i + 1]); buf += Anope::Hex(digest2, 16); - Alog(LOG_DEBUG_2) << "(enc_old) hashed password from [" << src << "] to [" << buf << "]"; + Log(LOG_DEBUG_2) << "(enc_old) hashed password from [" << src << "] to [" << buf << "]"; dest = buf; return EVENT_ALLOW; } diff --git a/modules/core/enc_sha1.cpp b/modules/core/enc_sha1.cpp index 28175fd3f..8dc3b57ab 100644 --- a/modules/core/enc_sha1.cpp +++ b/modules/core/enc_sha1.cpp @@ -190,7 +190,7 @@ class ESHA1 : public Module SHA1Final(reinterpret_cast<unsigned char *>(digest), &context); buf += Anope::Hex(digest, 20); - Alog(LOG_DEBUG_2) << "(enc_sha1) hashed password from [" << src << "] to [" << buf << "]"; + Log(LOG_DEBUG_2) << "(enc_sha1) hashed password from [" << src << "] to [" << buf << "]"; dest = buf; return EVENT_ALLOW; } diff --git a/modules/core/enc_sha256.cpp b/modules/core/enc_sha256.cpp index 16a26a77b..6dbfc3eed 100644 --- a/modules/core/enc_sha256.cpp +++ b/modules/core/enc_sha256.cpp @@ -275,7 +275,7 @@ class ESHA256 : public Module SHA256Final(&ctx, reinterpret_cast<unsigned char *>(digest)); digest[SHA256_DIGEST_SIZE] = '\0'; buf << "sha256:" << Anope::Hex(digest, SHA256_DIGEST_SIZE) << ":" << GetIVString(); - Alog(LOG_DEBUG_2) << "(enc_sha256) hashed password from [" << src << "] to [" << buf.str() << " ]"; + Log(LOG_DEBUG_2) << "(enc_sha256) hashed password from [" << src << "] to [" << buf.str() << " ]"; dest = buf.str(); return EVENT_ALLOW; } diff --git a/modules/core/hs_del.cpp b/modules/core/hs_del.cpp index 4ef8d8424..9f3794c25 100644 --- a/modules/core/hs_del.cpp +++ b/modules/core/hs_del.cpp @@ -31,7 +31,7 @@ class CommandHSDel : public Command notice_lang(Config->s_HostServ, u, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } - Alog() << "vHost for user \2" << nick << "\2 deleted by oper \2" << u->nick << "\2"; + Log(LOG_ADMIN, u, this) << "for user " << na->nick; FOREACH_MOD(I_OnDeleteVhost, OnDeleteVhost(na)); na->hostinfo.RemoveVhost(); notice_lang(Config->s_HostServ, u, HOST_DEL, nick.c_str()); diff --git a/modules/core/hs_delall.cpp b/modules/core/hs_delall.cpp index 301f14473..ca4d804a3 100644 --- a/modules/core/hs_delall.cpp +++ b/modules/core/hs_delall.cpp @@ -38,7 +38,7 @@ class CommandHSDelAll : public Command na = *it; na->hostinfo.RemoveVhost(); } - Alog() << "vHosts for all nicks in group \2" << nc->display << "\2 deleted by oper \2" << u->nick << "\2"; + Log(LOG_ADMIN, u, this) << "for all nicks in group " << nc->display; notice_lang(Config->s_HostServ, u, HOST_DELALL, nc->display.c_str()); } else diff --git a/modules/core/hs_off.cpp b/modules/core/hs_off.cpp index ef7039aeb..1338f14b3 100644 --- a/modules/core/hs_off.cpp +++ b/modules/core/hs_off.cpp @@ -29,6 +29,7 @@ class CommandHSOff : public Command else { ircdproto->SendVhostDel(u); + Log(LOG_COMMAND, u, this) << "to disable their vhost"; notice_lang(Config->s_HostServ, u, HOST_OFF); } diff --git a/modules/core/hs_on.cpp b/modules/core/hs_on.cpp index b94f22264..a57b8d8f2 100644 --- a/modules/core/hs_on.cpp +++ b/modules/core/hs_on.cpp @@ -29,6 +29,7 @@ class CommandHSOn : public Command notice_lang(Config->s_HostServ, u, HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); else notice_lang(Config->s_HostServ, u, HOST_ACTIVATED, na->hostinfo.GetHost().c_str()); + Log(LOG_COMMAND, u, this) << "to enable their vhost of " << (!na->hostinfo.GetIdent().empty() ? na->hostinfo.GetIdent() + "@" : "") << na->hostinfo.GetHost(); ircdproto->SendVhost(u, na->hostinfo.GetIdent(), na->hostinfo.GetHost()); if (ircd->vhost) u->vhost = na->hostinfo.GetHost(); diff --git a/modules/core/hs_set.cpp b/modules/core/hs_set.cpp index 8ee6a8723..68407790a 100644 --- a/modules/core/hs_set.cpp +++ b/modules/core/hs_set.cpp @@ -81,7 +81,8 @@ class CommandHSSet : public Command notice_lang(Config->s_HostServ, u, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } - Alog() << "vHost for user \2" << nick << "\2 set to \2" << (!vIdent.empty() && ircd->vident ? vIdent : "") << (!vIdent.empty() && ircd->vident ? "@" : "") << hostmask << " \2 by oper \2" << u->nick << "\2"; + + Log(LOG_ADMIN, u, this) << "to set the vhost of " << na->nick << " to " << (!vIdent.empty() ? vIdent + "@" : "") << hostmask; na->hostinfo.SetVhost(vIdent, hostmask, u->nick); FOREACH_MOD(I_OnSetVhost, OnSetVhost(na)); diff --git a/modules/core/hs_setall.cpp b/modules/core/hs_setall.cpp index 3ace182fd..bea594da6 100644 --- a/modules/core/hs_setall.cpp +++ b/modules/core/hs_setall.cpp @@ -86,7 +86,7 @@ class CommandHSSetAll : public Command tmp_time = time(NULL); - Alog() << "vHost for all nicks in group \2" << nick << "\2 set to \2" << (!vIdent.empty() && ircd->vident ? vIdent : "") << (!vIdent.empty() && ircd->vident ? "@" : "") << hostmask << " \2 by oper \2" << u->nick << "\2"; + Log(LOG_ADMIN, u, this) << "to set the vhost for all nicks in group " << na->nc->display << " to " << (!vIdent.empty() ? vIdent + "@" : "") << hostmask; na->hostinfo.SetVhost(vIdent, hostmask, u->nick); HostServSyncVhosts(na); diff --git a/modules/core/ms_rsend.cpp b/modules/core/ms_rsend.cpp index 03c643c11..6ed6b3b03 100644 --- a/modules/core/ms_rsend.cpp +++ b/modules/core/ms_rsend.cpp @@ -47,7 +47,7 @@ class CommandMSRSend : public Command else { /* rsend has been disabled */ - Alog(LOG_DEBUG) << "MSMemoReceipt is set misconfigured to " << Config->MSMemoReceipt; + Log() << "MSMemoReceipt is set misconfigured to " << Config->MSMemoReceipt; notice_lang(Config->s_MemoServ, u, MEMO_RSEND_DISABLED); } diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp index 497a375f1..4180bf0e6 100644 --- a/modules/core/ns_drop.cpp +++ b/modules/core/ns_drop.cpp @@ -42,7 +42,7 @@ class CommandNSDrop : public Command { if (Config->WallDrop) ircdproto->SendGlobops(NickServ, "\2%s\2 used DROP on \2%s\2", u->nick.c_str(), nick.c_str()); - Alog() << Config->s_NickServ << ": " << u->GetMask() << " dropped nickname " << nr->nick << " (e-mail: " << nr->email << ")"; + Log(LOG_ADMIN, u, this) << "to drop nickname " << nr->nick << " (email: " << nr->email << ")"; delete nr; notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, nick.c_str()); } @@ -73,7 +73,7 @@ class CommandNSDrop : public Command ircdproto->SendSQLineDel(&x); } - Alog() << Config->s_NickServ << ": " << u->GetMask() << " dropped nickname " << na->nick << " (group " << na->nc->display << ") (e-mail: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")"; + Log(!is_mine ? LOG_OVERRIDE : LOG_COMMAND, u, this) << "to drop nickname " << na->nick << " (group: " << na->nc->display << ") (email: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")"; delete na; FOREACH_MOD(I_OnNickDrop, OnNickDrop(!my_nick.empty() ? my_nick : nick)); diff --git a/modules/core/ns_forbid.cpp b/modules/core/ns_forbid.cpp index f10b1f04e..e7c3162a2 100644 --- a/modules/core/ns_forbid.cpp +++ b/modules/core/ns_forbid.cpp @@ -76,14 +76,15 @@ class CommandNSForbid : public Command if (Config->WallForbid) ircdproto->SendGlobops(NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick.c_str(), nick.c_str()); - Alog() << Config->s_NickServ << ": " << u->nick << " set FORBID for nick " << nick; + Log(LOG_ADMIN, u, this) << "to forbid nick " << nick; notice_lang(Config->s_NickServ, u, NICK_FORBID_SUCCEEDED, nick.c_str()); FOREACH_MOD(I_OnNickForbidden, OnNickForbidden(na)); } else { - Alog() << Config->s_NickServ << ": Valid FORBID for " << nick << " by " << u->nick << " failed"; + // XXX cant happen ? + //Alog() << Config->s_NickServ << ": Valid FORBID for " << nick << " by " << u->nick << " failed"; notice_lang(Config->s_NickServ, u, NICK_FORBID_FAILED, nick.c_str()); } return MOD_CONT; diff --git a/modules/core/ns_getemail.cpp b/modules/core/ns_getemail.cpp index dbfb91562..1d8afcad1 100644 --- a/modules/core/ns_getemail.cpp +++ b/modules/core/ns_getemail.cpp @@ -29,7 +29,7 @@ class CommandNSGetEMail : public Command Anope::string email = params[0]; int j = 0; - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used GETEMAIL on " << email; + Log(LOG_ADMIN, u, this) << "on " << email; for (nickcore_map::const_iterator it = NickCoreList.begin(), it_end = NickCoreList.end(); it != it_end; ++it) { diff --git a/modules/core/ns_getpass.cpp b/modules/core/ns_getpass.cpp index e4f196d23..a2d288cbc 100644 --- a/modules/core/ns_getpass.cpp +++ b/modules/core/ns_getpass.cpp @@ -31,7 +31,7 @@ class CommandNSGetPass : public Command { if ((nr = findrequestnick(nick))) { - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used GETPASS on " << nick; + Log(LOG_ADMIN, u, this) << "for " << nr->nick; if (Config->WallGetpass) ircdproto->SendGlobops(NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick.c_str(), nick.c_str()); notice_lang(Config->s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick.c_str(), nr->passcode.c_str()); @@ -47,7 +47,7 @@ class CommandNSGetPass : public Command { if (enc_decrypt(na->nc->pass, tmp_pass) == 1) { - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used GETPASS on " << nick; + Log(LOG_ADMIN, u, this) << "for " << nick; if (Config->WallGetpass) ircdproto->SendGlobops(NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick.c_str(), nick.c_str()); notice_lang(Config->s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick.c_str(), tmp_pass.c_str()); diff --git a/modules/core/ns_ghost.cpp b/modules/core/ns_ghost.cpp index 9c19b0af7..a4f1b5f8f 100644 --- a/modules/core/ns_ghost.cpp +++ b/modules/core/ns_ghost.cpp @@ -42,6 +42,7 @@ class CommandNSGhost : public Command int res = enc_check_password(pass, na->nc->pass); if (res == 1) { + Log(LOG_COMMAND, u, this) << "for " << nick; Anope::string buf = "GHOST command used by " + u->nick; kill_user(Config->s_NickServ, nick, buf); notice_lang(Config->s_NickServ, u, NICK_GHOST_KILLED, nick.c_str()); @@ -51,7 +52,7 @@ class CommandNSGhost : public Command notice_lang(Config->s_NickServ, u, ACCESS_DENIED); if (!res) { - Alog() << Config->s_NickServ << ": GHOST: invalid password for " << nick << " by " << u->GetMask(); + Log(LOG_COMMAND, u, this) << "invalid password for " << nick; if (bad_password(u)) return MOD_STOP; } @@ -61,6 +62,7 @@ class CommandNSGhost : public Command { if (u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc))) { + Log(LOG_COMMAND, u, this) << "for " << nick; Anope::string buf = "GHOST command used by " + u->nick; kill_user(Config->s_NickServ, nick, buf); notice_lang(Config->s_NickServ, u, NICK_GHOST_KILLED, nick.c_str()); diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp index 915915af3..22fad9b3c 100644 --- a/modules/core/ns_group.cpp +++ b/modules/core/ns_group.cpp @@ -61,12 +61,12 @@ class CommandNSGroup : public Command notice_lang(Config->s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - time(NULL)); else if (u->Account() && u->Account()->HasFlag(NI_SUSPENDED)) { - Alog() << Config->s_NickServ << ": " << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick; + //Alog() << Config->s_NickServ << ": " << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick; notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, u->nick.c_str()); } else if (target && target->nc->HasFlag(NI_SUSPENDED)) { - Alog() << Config->s_NickServ << ": " << u->GetMask() << " tried to use GROUP for SUSPENDED nick " << target->nick; + Log(LOG_COMMAND, u, this) << "tried to use GROUP for SUSPENDED nick " << target->nick; notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, target->nick.c_str()); } else if (target->HasFlag(NS_FORBIDDEN)) @@ -82,7 +82,7 @@ class CommandNSGroup : public Command int res = enc_check_password(pass, target->nc->pass); if (res == -1) { - Alog() << Config->s_NickServ << ": Failed GROUP for " << u->GetMask() << " (invalid password)"; + Log(LOG_COMMAND, u, this) << "failed group for " << na->nick << " (invalid password)"; notice_lang(Config->s_NickServ, u, PASSWORD_INCORRECT); if (bad_password(u)) return MOD_STOP; @@ -119,8 +119,7 @@ class CommandNSGroup : public Command FOREACH_MOD(I_OnNickGroup, OnNickGroup(u, target)); ircdproto->SetAutoIdentificationToken(u); - Alog() << Config->s_NickServ << ": " << u->GetMask() << " makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (e-mail: " << - (!target->nc->email.empty() ? target->nc->email : "none") << ")"; + Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")"; notice_lang(Config->s_NickServ, u, NICK_GROUP_JOINED, target->nick.c_str()); u->lastnickreg = time(NULL); @@ -129,7 +128,8 @@ class CommandNSGroup : public Command } else { - Alog() << Config->s_NickServ << ": makealias(" << u->nick << ") failed"; + // XXX not possible? + //Alog() << Config->s_NickServ << ": makealias(" << u->nick << ") failed"; notice_lang(Config->s_NickServ, u, NICK_GROUP_FAILED); } } diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp index 6746a6e02..c365de116 100644 --- a/modules/core/ns_identify.cpp +++ b/modules/core/ns_identify.cpp @@ -50,7 +50,7 @@ class CommandNSIdentify : public Command res = enc_check_password(pass, na->nc->pass); if (!res) { - Alog() << Config->s_NickServ << ": Failed IDENTIFY for " << u->nick << "!" << u->GetIdent() << "@" << u->host; + Log(LOG_COMMAND, u, this) << "failed to identify"; notice_lang(Config->s_NickServ, u, PASSWORD_INCORRECT); if (bad_password(u)) return MOD_STOP; @@ -60,7 +60,7 @@ class CommandNSIdentify : public Command else { if (u->IsIdentified()) - Alog() << Config->s_NickServ << ": " << u->GetMask() << " logged out of account " << u->Account()->display; + Log(LOG_COMMAND, "nickserv/identify") << "logged out of account " << u->Account()->display; na->last_realname = u->realname; na->last_seen = time(NULL); @@ -73,7 +73,7 @@ class CommandNSIdentify : public Command FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u)); - Alog() << Config->s_NickServ << ": " << u->GetMask() << " identified for account " << u->Account()->display; + Log(LOG_COMMAND, u, this) << "identified for account " << u->Account()->display; notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_SUCCEEDED); if (ircd->vhost) do_on_id(u); diff --git a/modules/core/ns_logout.cpp b/modules/core/ns_logout.cpp index 7d0d69254..7d09f9111 100644 --- a/modules/core/ns_logout.cpp +++ b/modules/core/ns_logout.cpp @@ -38,7 +38,7 @@ class CommandNSLogout : public Command validate_user(u2); u2->isSuperAdmin = 0; /* Dont let people logout and remain a SuperAdmin */ - Alog() << Config->s_NickServ << ": " << u->GetMask() << " logged out nickname " << u2->nick; + Log(LOG_COMMAND, u, this) << "to logout " << u2->nick; /* Remove founder status from this user in all channels */ if (!nick.empty()) diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp index e2f4befdf..868a7f69e 100644 --- a/modules/core/ns_recover.cpp +++ b/modules/core/ns_recover.cpp @@ -57,7 +57,7 @@ class CommandNSRecover : public Command notice_lang(Config->s_NickServ, u, ACCESS_DENIED); if (!res) { - Alog() << Config->s_NickServ << ": RECOVER: invalid password for " << nick << " by " << u->GetMask(); + Log(LOG_COMMAND, u, this) << "with invalid password for " << nick; if (bad_password(u)) return MOD_STOP; } diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp index eb126a791..48a869bb8 100644 --- a/modules/core/ns_register.cpp +++ b/modules/core/ns_register.cpp @@ -24,7 +24,8 @@ class CommandNSConfirm : public Command if (!na) { - Alog() << Config->s_NickServ << ": makenick(" << u->nick << ") failed"; + // XXX + //Alog() << Config->s_NickServ << ": makenick(" << u->nick << ") failed"; notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_FAILED); return MOD_CONT; } @@ -57,7 +58,7 @@ class CommandNSConfirm : public Command if (!force) { u->Login(na->nc); - Alog() << Config->s_NickServ << ": '" << u->nick << "' registered by " << u->GetIdent() << "@" << u->host << " (e-mail: " << (!nr->email.empty() ? nr->email : "none") << ")"; + Log(LOG_COMMAND, u, this) << "to register " << u->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")"; if (Config->NSAddAccessOnReg) notice_lang(Config->s_NickServ, u, NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str()); else @@ -74,7 +75,7 @@ class CommandNSConfirm : public Command } else { - Alog() << Config->s_NickServ << ": '" << nr->nick << "' confirmed by " << u->GetMask() << " (email: " << (!nr->email.empty() ? nr->email : "none") << " )"; + Log(LOG_COMMAND, u, this) << "to confirm " << u->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")"; notice_lang(Config->s_NickServ, u, NICK_FORCE_REG, nr->nick.c_str()); User *user = finduser(nr->nick); /* Delrequest must be called before validate_user */ @@ -250,7 +251,8 @@ class CommandNSRegister : public CommandNSConfirm /* i.e. there's already such a nick regged */ if (na->HasFlag(NS_FORBIDDEN)) { - Alog() << Config->s_NickServ << ": " << u->GetIdent() << "@" << u->host << " tried to register FORBIDden nick " << u->nick; + // XXX + //Alog() << Config->s_NickServ << ": " << u->GetIdent() << "@" << u->host << " tried to register FORBIDden nick " << u->nick; notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); } else @@ -278,11 +280,11 @@ class CommandNSRegister : public CommandNSConfirm if (SendRegmail(u, nr)) { notice_lang(Config->s_NickServ, u, NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str()); - Alog() << Config->s_NickServ << ": sent registration verification code to " << nr->email; + Log(LOG_COMMAND, u, this) << "send registration verification code to " << nr->email; } else { - Alog() << Config->s_NickServ << ": Unable to send registration verification mail"; + Log(LOG_COMMAND, u, this) << "unable to send registration verification mail"; notice_lang(Config->s_NickServ, u, NICK_REG_UNABLE); delete nr; return MOD_CONT; @@ -342,11 +344,11 @@ class CommandNSResend : public Command { nr->lastmail = time(NULL); notice_lang(Config->s_NickServ, u, NICK_REG_RESENT, nr->email.c_str()); - Alog() << Config->s_NickServ << ": re-sent registration verification code for " << nr->nick << " to " << nr->email; + Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick; } else { - Alog() << Config->s_NickServ << ": Unable to re-send registration verification mail for " << nr->nick; + Log(LOG_COMMAND, u, this) << "unable to resend registration verification code for " << nr->nick; return MOD_CONT; } } diff --git a/modules/core/ns_release.cpp b/modules/core/ns_release.cpp index bb455d23e..1fe340758 100644 --- a/modules/core/ns_release.cpp +++ b/modules/core/ns_release.cpp @@ -40,7 +40,7 @@ class CommandNSRelease : public Command int res = enc_check_password(pass, na->nc->pass); if (res == 1) { - na->Release(); + Log(LOG_COMMAND, u, this) << "released " << na->nick; notice_lang(Config->s_NickServ, u, NICK_RELEASED); } else @@ -48,7 +48,7 @@ class CommandNSRelease : public Command notice_lang(Config->s_NickServ, u, ACCESS_DENIED); if (!res) { - Alog() << Config->s_NickServ << ": RELEASE: invalid password for " << nick << " by " << u->GetMask(); + Log(LOG_COMMAND, u, this) << "invalid password for " << nick; if (bad_password(u)) return MOD_STOP; } diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp index bae4eb1b2..05c0b5e6b 100644 --- a/modules/core/ns_resetpass.cpp +++ b/modules/core/ns_resetpass.cpp @@ -36,7 +36,7 @@ class CommandNSResetPass : public Command { if (SendResetEmail(u, na)) { - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used RESETPASS on " << na->nick << " (" << na->nc->display << ")"; + Log(LOG_COMMAND, u, this) << "for " << na->nick << " (group: " << na->nc->display << ")"; notice_lang(Config->s_NickServ, u, NICK_RESETPASS_COMPLETE, na->nick.c_str()); } } @@ -111,7 +111,7 @@ class NSResetPass : public Module ircdproto->SetAutoIdentificationToken(u); FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u)); - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used CONFIRM with RESETPASS to forcefully identify to " << na->nick; + Log(LOG_COMMAND, u, &commandnsresetpass) << "confirmed RESETPASS to forcefully identify to " << na->nick; notice_lang(Config->s_NickServ, u, NICK_CONFIRM_SUCCESS, Config->s_NickServ.c_str()); if (ircd->vhost) @@ -122,7 +122,7 @@ class NSResetPass : public Module } else { - Alog() << Config->s_NickServ << ": Invalid CONFIRM passcode for " << na->nick << " from " << u->GetMask(); + Log(LOG_COMMAND, u, &commandnsresetpass) << "invalid confirm passcode for " << na->nick; notice_lang(Config->s_NickServ, u, NICK_CONFIRM_INVALID); bad_password(u); } diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp index 73cb706b9..c6494d292 100644 --- a/modules/core/ns_saset.cpp +++ b/modules/core/ns_saset.cpp @@ -55,6 +55,7 @@ class CommandNSSASet : public Command Anope::string cmdparams = na->nc->display; for (std::vector<Anope::string>::const_iterator it = params.begin() + 2; it != params.end(); ++it) cmdparams += " " + *it; + Log(LOG_ADMIN, u, this) << params[1] << " " << cmdparams; mod_run_cmd(NickServ, u, c, params[1], cmdparams); } else @@ -192,7 +193,8 @@ class CommandNSSASetPassword : public Command if (enc_encrypt(params[1], nc->pass)) { - Alog() << Config->s_NickServ << ": Failed to encrypt password for " << nc->display << " (saset)"; + // XXX + //Alog() << Config->s_NickServ << ": Failed to encrypt password for " << nc->display << " (saset)"; notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_FAILED, nc->display.c_str()); return MOD_CONT; } @@ -203,8 +205,6 @@ class CommandNSSASetPassword : public Command else notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display.c_str()); - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used SASET PASSWORD on " << nc->display << " (e-mail: "<< (!nc->email.empty() ? nc->email : "none") << ")"; - if (Config->WallSetpass) ircdproto->SendGlobops(NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick.c_str(), nc->display.c_str()); diff --git a/modules/core/ns_sendpass.cpp b/modules/core/ns_sendpass.cpp index e5695e37e..f437e4a9e 100644 --- a/modules/core/ns_sendpass.cpp +++ b/modules/core/ns_sendpass.cpp @@ -40,7 +40,7 @@ class CommandNSSendPass : public Command { if (SendPassMail(u, na, tmp_pass)) { - Alog() << Config->s_NickServ << ": " << u->GetMask() << " used SENDPASS on " << nick; + Log(Config->RestrictMail ? LOG_ADMIN : LOG_COMMAND, u, this) << "for " << na->nick; notice_lang(Config->s_NickServ, u, NICK_SENDPASS_OK, nick.c_str()); } } diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp index fde4d6cb5..2eb7c6a19 100644 --- a/modules/core/ns_set.cpp +++ b/modules/core/ns_set.cpp @@ -175,7 +175,8 @@ class CommandNSSetPassword : public Command if (enc_encrypt(param, u->Account()->pass) < 0) { - Alog() << Config->s_NickServ << ": Failed to encrypt password for " << u->Account()->display << " (set)"; + // XXX ? + //Alog() << Config->s_NickServ << ": Failed to encrypt password for " << u->Account()->display << " (set)"; notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_FAILED); return MOD_CONT; } @@ -186,7 +187,6 @@ class CommandNSSetPassword : public Command else notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, u->Account()->display.c_str()); - Alog() << Config->s_NickServ << ": " << u->GetMask() << " (e-mail: " << (!u->Account()->email.empty() ? u->Account()->email : "none") << ") changed its password."; return MOD_CONT; } diff --git a/modules/core/ns_set_email.cpp b/modules/core/ns_set_email.cpp index d8471e2db..9820d9632 100644 --- a/modules/core/ns_set_email.cpp +++ b/modules/core/ns_set_email.cpp @@ -44,8 +44,6 @@ class CommandNSSetEmail : public Command return MOD_CONT; } - Alog() << Config->s_NickServ << ": " << u->GetMask() << " (e-mail: " << (!u->Account()->email.empty() ? u->Account()->email : "none") << ") changed the e-mail of " << nc->display << " to " << (!param.empty() ? param : "none"); - if (!param.empty()) { nc->email = param; diff --git a/modules/core/ns_suspend.cpp b/modules/core/ns_suspend.cpp index ff5de7768..488ed4f04 100644 --- a/modules/core/ns_suspend.cpp +++ b/modules/core/ns_suspend.cpp @@ -76,7 +76,7 @@ class CommandNSSuspend : public Command if (Config->WallForbid) ircdproto->SendGlobops(NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick.c_str(), nick.c_str()); - Alog() << Config->s_NickServ << ": " << u->nick << " set SUSPEND for nick " << nick; + Log(LOG_ADMIN, u, this) << "for " << nick << " (" << (!reason.empty() ? reason : "No reason") << ")"; notice_lang(Config->s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick.c_str()); FOREACH_MOD(I_OnNickSuspended, OnNickSuspend(na)); @@ -142,7 +142,7 @@ class CommandNSUnSuspend : public Command if (Config->WallForbid) ircdproto->SendGlobops(NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick.c_str(), nick.c_str()); - Alog() << Config->s_NickServ << ": " << u->nick << " set UNSUSPEND for nick " << nick; + Log(LOG_ADMIN, u, this) << "for " << na->nick; notice_lang(Config->s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick.c_str()); FOREACH_MOD(I_OnNickUnsuspended, OnNickUnsuspended(na)); diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp index e52b25269..009d34dda 100644 --- a/modules/core/os_defcon.cpp +++ b/modules/core/os_defcon.cpp @@ -32,7 +32,7 @@ class DefConTimeout : public Timer { Config->DefConLevel = level; FOREACH_MOD(I_OnDefconLevel, OnDefconLevel(level)); - Alog() << "Defcon level timeout, returning to lvl " << level; + Log(OperServ, "operserv/defcon") << "Defcon level timeout, returning to level " << level; ircdproto->SendGlobops(OperServ, getstring(OPER_DEFCON_WALL), Config->s_OperServ.c_str(), level); if (Config->GlobalOnDefcon) @@ -92,7 +92,7 @@ class CommandOSDefcon : public Command notice_lang(Config->s_OperServ, u, OPER_DEFCON_CHANGED, Config->DefConLevel); defcon_sendlvls(u); - Alog() << "Defcon level changed to " << newLevel << " by Oper " << u->nick; + Log(LOG_ADMIN, u, this) << "to change defcon level to " << newLevel; ircdproto->SendGlobops(OperServ, getstring(OPER_DEFCON_WALL), u->nick.c_str(), newLevel); /* Global notice the user what is happening. Also any Message that the Admin would like to add. Set in config file. */ @@ -157,7 +157,7 @@ class OSDefcon : public Module { if (CheckDefCon(DEFCON_AKILL_NEW_CLIENTS)) { - Alog() << "DEFCON: adding akill for *@" << u->host; + Log(OperServ, "operserv/defcon") << "DEFCON: adding akill for *@" << u->host; XLine *x = SGLine->Add(NULL, NULL, "*@" + u->host, time(NULL) + Config->DefConAKILL, !Config->DefConAkillReason.empty() ? Config->DefConAkillReason : "DEFCON AKILL"); if (x) x->By = Config->s_OperServ; @@ -352,7 +352,7 @@ void runDefCon() { if (Config->DefConChanModes[0] == '+' || Config->DefConChanModes[0] == '-') { - Alog() << "DEFCON: setting " << Config->DefConChanModes << " on all channels"; + Log(OperServ, "operserv/defcon") << "DEFCON: setting " << Config->DefConChanModes << " on all channels"; DefConModesSet = true; MassChannelModes(OperServ, Config->DefConChanModes); } @@ -368,7 +368,7 @@ void runDefCon() Anope::string newmodes = defconReverseModes(Config->DefConChanModes); if (!newmodes.empty()) { - Alog() << "DEFCON: setting " << newmodes << " on all channels"; + Log(OperServ, "operserv/defcon") << "DEFCON: setting " << newmodes << " on all channels"; MassChannelModes(OperServ, newmodes); } } @@ -420,7 +420,7 @@ void defconParseModeString(const Anope::string &str) { if (cm->Type == MODE_STATUS || cm->Type == MODE_LIST || !cm->CanSet(NULL)) { - Alog() << "DefConChanModes mode character '" << mode << "' cannot be locked"; + Log() << "DefConChanModes mode character '" << mode << "' cannot be locked"; continue; } else if (add) @@ -434,7 +434,7 @@ void defconParseModeString(const Anope::string &str) if (!ss.GetToken(param)) { - Alog() << "DefConChanModes mode character '" << mode << "' has no parameter while one is expected"; + Log() << "DefConChanModes mode character '" << mode << "' has no parameter while one is expected"; continue; } @@ -462,7 +462,7 @@ void defconParseModeString(const Anope::string &str) { DefConModesOn.UnsetFlag(CMODE_REDIRECT); - Alog() << "DefConChanModes must lock mode +l as well to lock mode +L"; + Log() << "DefConChanModes must lock mode +l as well to lock mode +L"; } /* Some ircd we can't set NOKNOCK without INVITE */ @@ -470,7 +470,7 @@ void defconParseModeString(const Anope::string &str) if (ircd->knock_needs_i && (cm = ModeManager::FindChannelModeByName(CMODE_NOKNOCK)) && DefConModesOn.HasFlag(cm->Name) && !DefConModesOn.HasFlag(CMODE_INVITE)) { DefConModesOn.UnsetFlag(CMODE_NOKNOCK); - Alog() << "DefConChanModes must lock mode +i as well to lock mode +K"; + Log() << "DefConChanModes must lock mode +i as well to lock mode +K"; } } diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp index d62b3221a..05ac57c9b 100644 --- a/modules/core/os_ignore.cpp +++ b/modules/core/os_ignore.cpp @@ -170,7 +170,7 @@ class OSIgnore : public Module { if ((*ign)->time && (*ign)->time <= now) { - Alog(LOG_DEBUG) << "[os_ignore] Expiring ignore entry " << (*ign)->mask; + Log(LOG_DEBUG) << "[os_ignore] Expiring ignore entry " << (*ign)->mask; delete *ign; ign = ignore.erase(ign); } diff --git a/modules/core/os_modunload.cpp b/modules/core/os_modunload.cpp index ceea0c658..801714a16 100644 --- a/modules/core/os_modunload.cpp +++ b/modules/core/os_modunload.cpp @@ -32,7 +32,7 @@ class CommandOSModUnLoad : public Command return MOD_CONT; } - Alog() << "Trying to unload module [" << mname << "]"; + Log() << "Trying to unload module [" << mname << "]"; status = ModuleManager::UnloadModule(m, u); diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp index c12f66756..8b286eebb 100644 --- a/modules/core/os_news.cpp +++ b/modules/core/os_news.cpp @@ -90,10 +90,7 @@ static void DisplayNews(User *u, NewsType Type) else if (Type == NEWS_RANDOM) msg = NEWS_RANDOM_TEXT; else - { - Alog() << "news: Invalid type (" << Type << ") to display_news()"; - return; - } + throw CoreException("news: Invalid type (" + stringify(Type) + ") to display_news()"); unsigned displayed = 0; bool NewsExists = false; @@ -277,10 +274,7 @@ class NewsBase : public Command msgs = findmsgs(type, type_name); if (!msgs) - { - Alog() << "news: Invalid type to do_news()"; - return MOD_CONT; - } + throw CoreException("news: Invalid type to do_news()"); if (cmd.equals_ci("LIST")) return this->DoList(u, type, msgs); diff --git a/modules/core/os_reload.cpp b/modules/core/os_reload.cpp index 4344efcff..21b719db9 100644 --- a/modules/core/os_reload.cpp +++ b/modules/core/os_reload.cpp @@ -31,7 +31,7 @@ class CommandOSReload : public Command } catch (const ConfigException &ex) { - Alog() << "Error reloading configuration file: " << ex.GetReason(); + Log() << "Error reloading configuration file: " << ex.GetReason(); } notice_lang(Config->s_OperServ, u, OPER_RELOAD); diff --git a/modules/core/os_set.cpp b/modules/core/os_set.cpp index 377dddfcf..f8790623f 100644 --- a/modules/core/os_set.cpp +++ b/modules/core/os_set.cpp @@ -18,14 +18,14 @@ class CommandOSSet : public Command private: CommandReturn DoList(User *u) { + Log(LOG_ADMIN, u, this); + int index; index = allow_ignore ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; notice_lang(Config->s_OperServ, u, index, "IGNORE"); index = readonly ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; notice_lang(Config->s_OperServ, u, index, "READONLY"); - index = LogChan ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(Config->s_OperServ, u, index, "LOGCHAN"); index = debug ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; notice_lang(Config->s_OperServ, u, index, "DEBUG"); index = noexpire ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; @@ -46,11 +46,13 @@ class CommandOSSet : public Command if (setting.equals_ci("ON")) { + Log(LOG_ADMIN, u, this) << "IGNORE ON"; allow_ignore = 1; notice_lang(Config->s_OperServ, u, OPER_SET_IGNORE_ON); } else if (setting.equals_ci("OFF")) { + Log(LOG_ADMIN, u, this) << "IGNORE OFF"; allow_ignore = 0; notice_lang(Config->s_OperServ, u, OPER_SET_IGNORE_OFF); } @@ -73,15 +75,13 @@ class CommandOSSet : public Command if (setting.equals_ci("ON")) { readonly = true; - Alog() << "Read-only mode activated"; - close_log(); + Log(LOG_ADMIN, u, this) << "READONLY ON"; notice_lang(Config->s_OperServ, u, OPER_SET_READONLY_ON); } else if (setting.equals_ci("OFF")) { readonly = false; - open_log(); - Alog() << "Read-only mode deactivated"; + Log(LOG_ADMIN, u, this) << "READONLY OFF"; notice_lang(Config->s_OperServ, u, OPER_SET_READONLY_OFF); } else @@ -90,52 +90,6 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandReturn DoSetLogChan(User *u, const std::vector<Anope::string> ¶ms) - { - Anope::string setting = params.size() > 1 ? params[1] : ""; - Channel *c; - - if (setting.empty()) - { - this->OnSyntaxError(u, "LOGCHAN"); - return MOD_CONT; - } - - /* Unlike the other SET commands where only stricmp is necessary, - * we also have to ensure that Config->LogChannel is defined or we can't - * send to it. - * - * -jester - */ - if (!Config->LogChannel.empty() && setting.equals_ci("ON")) - { - if (ircd->join2msg) - { - c = findchan(Config->LogChannel); - if (c) - Global->Join(c); - else - Global->Join(Config->LogChannel); - } - LogChan = true; - Alog() << "Now sending log messages to " << Config->LogChannel; - notice_lang(Config->s_OperServ, u, OPER_SET_LOGCHAN_ON, Config->LogChannel.c_str()); - } - else if (!Config->LogChannel.empty() && setting.equals_ci("OFF")) - { - Alog() << "No longer sending log messages to a channel"; - c = findchan(Config->LogChannel); - if (ircd->join2msg && c) - Global->Part(c); - LogChan = false; - notice_lang(Config->s_OperServ, u, OPER_SET_LOGCHAN_OFF); - } - else - notice_lang(Config->s_OperServ, u, OPER_SET_LOGCHAN_ERROR); - - return MOD_CONT; - } - CommandReturn DoSetSuperAdmin(User *u, const std::vector<Anope::string> ¶ms) { Anope::string setting = params.size() > 1 ? params[1] : ""; @@ -157,14 +111,14 @@ class CommandOSSet : public Command { u->isSuperAdmin = 1; notice_lang(Config->s_OperServ, u, OPER_SUPER_ADMIN_ON); - Alog() << Config->s_OperServ << ": " << u->nick << " is a SuperAdmin"; + Log(LOG_ADMIN, u, this) << "SUPERADMIN ON"; ircdproto->SendGlobops(OperServ, getstring(OPER_SUPER_ADMIN_WALL_ON), u->nick.c_str()); } else if (setting.equals_ci("OFF")) { u->isSuperAdmin = 0; notice_lang(Config->s_OperServ, u, OPER_SUPER_ADMIN_OFF); - Alog() << Config->s_OperServ << ": " << u->nick << " is no longer a SuperAdmin"; + Log(LOG_ADMIN, u, this) << "SUPERADMIN OFF"; ircdproto->SendGlobops(OperServ, getstring(OPER_SUPER_ADMIN_WALL_OFF), u->nick.c_str()); } else @@ -186,19 +140,19 @@ class CommandOSSet : public Command if (setting.equals_ci("ON")) { debug = 1; - Alog() << "Debug mode activated"; + Log(LOG_ADMIN, u, this) << "DEBUG ON"; notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_ON); } else if (setting.equals_ci("OFF") || (setting[0] == '0' && setting.is_number_only() && !convertTo<int>(setting))) { - Alog() << "Debug mode deactivated"; + Log(LOG_ADMIN, u, this) << "DEBUG OFF"; debug = 0; notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_OFF); } else if (setting.is_number_only() && convertTo<int>(setting) > 0) { debug = convertTo<int>(setting); - Alog() << "Debug mode activated (level " << debug << ")"; + Log(LOG_ADMIN, u, this) << "DEBUG " << debug; notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_LEVEL, debug); } else @@ -220,13 +174,13 @@ class CommandOSSet : public Command if (setting.equals_ci("ON")) { noexpire = true; - Alog() << "No expire mode activated"; + Log(LOG_ADMIN, u, this) << "NOEXPIRE ON"; notice_lang(Config->s_OperServ, u, OPER_SET_NOEXPIRE_ON); } else if (setting.equals_ci("OFF")) { noexpire = false; - Alog() << "No expire mode deactivated"; + Log(LOG_ADMIN, u, this) << "NOEXPIRE OFF"; notice_lang(Config->s_OperServ, u, OPER_SET_NOEXPIRE_OFF); } else @@ -249,8 +203,6 @@ class CommandOSSet : public Command return this->DoSetIgnore(u, params); else if (option.equals_ci("READONLY")) return this->DoSetReadOnly(u, params); - else if (option.equals_ci("LOGCHAN")) - return this->DoSetLogChan(u, params); else if (option.equals_ci("SUPERADMIN")) return this->DoSetSuperAdmin(u, params); else if (option.equals_ci("DEBUG")) @@ -270,8 +222,6 @@ class CommandOSSet : public Command notice_help(Config->s_OperServ, u, OPER_HELP_SET_LIST); else if (subcommand.equals_ci("READONLY")) notice_help(Config->s_OperServ, u, OPER_HELP_SET_READONLY); - else if (subcommand.equals_ci("LOGCHAN")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_LOGCHAN); else if (subcommand.equals_ci("DEBUG")) notice_help(Config->s_OperServ, u, OPER_HELP_SET_DEBUG); else if (subcommand.equals_ci("NOEXPIRE")) diff --git a/modules/core/ss_main.cpp b/modules/core/ss_main.cpp index 1b7188781..0e68a2795 100644 --- a/modules/core/ss_main.cpp +++ b/modules/core/ss_main.cpp @@ -41,10 +41,10 @@ class SSMain : public Module statserv = findbot("StatServ"); if (!statserv) { - Alog() << "Creating SS"; + Log() << "Creating SS"; statserv = new BotInfo("StatServ", Config->ServiceUser, Config->ServiceHost, "Stats Service"); } - Alog() << "Done creating SS"; + Log() << "Done creating SS"; this->AddCommand(statserv, &commandsshelp); } diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp index 3da548cf2..387c55f73 100644 --- a/modules/extra/cs_appendtopic.cpp +++ b/modules/extra/cs_appendtopic.cpp @@ -95,7 +95,7 @@ class CommandCSAppendTopic : public Command c->topic_time = ci->last_topic_time; if (!check_access(u, ci, CA_TOPIC)) - Alog() << Config->s_ChanServ << ": " << u->GetMask() << " changed topic of " << c->name << " as services admin."; + Log(LOG_OVERRIDE, u, this, ci) << "changed topic to " << topic; if (ircd->join2set && whosends(ci) == ChanServ) { ChanServ->Join(c); diff --git a/modules/extra/cs_enforce.cpp b/modules/extra/cs_enforce.cpp index 1f2472e47..5541aa5ca 100644 --- a/modules/extra/cs_enforce.cpp +++ b/modules/extra/cs_enforce.cpp @@ -60,8 +60,6 @@ class CommandCSEnforce : public Command if (!(ci = c->ci)) return; - Alog(LOG_DEBUG) << "[cs_enforce] Enforcing SECUREOPS on " << c->name; - /* Dirty hack to allow chan_set_correct_modes to work ok. * We pretend like SECUREOPS is on so it doesn't ignore that * part of the code. This way we can enforce SECUREOPS even @@ -94,8 +92,6 @@ class CommandCSEnforce : public Command if (!(ci = c->ci)) return; - Alog(LOG_DEBUG) << "[cs_enforce] Enforcing RESTRICTED on " << c->name; - old_nojoin_level = ci->levels[CA_NOJOIN]; if (ci->levels[CA_NOJOIN] < 0) ci->levels[CA_NOJOIN] = 0; @@ -124,8 +120,6 @@ class CommandCSEnforce : public Command if (!(ci = c->ci)) return; - Alog(LOG_DEBUG) << "[cs_enforce] Enforcing mode +R on " << c->name; - for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ) { UserContainer *uc = *it++; diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp index b52eb525e..8b4395043 100644 --- a/modules/extra/cs_set_misc.cpp +++ b/modules/extra/cs_set_misc.cpp @@ -151,7 +151,7 @@ class CSSetMisc : public Module CommandInfo *info = new CommandInfo(cname, desc, showhidden); if (!this->Commands.insert(std::make_pair(cname, info)).second) { - Alog() << "cs_set_misc: Warning, unable to add duplicate entry " << cname; + Log() << "cs_set_misc: Warning, unable to add duplicate entry " << cname; delete info; continue; } diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp index c09c2c336..4920e9b00 100644 --- a/modules/extra/db_mysql.cpp +++ b/modules/extra/db_mysql.cpp @@ -405,7 +405,7 @@ class DBMySQL : public Module { if (!SQL) { - Alog() << "Error, unable to find service reference for SQL, is m_mysql loaded and configured properly?"; + Log() << "Error, unable to find service reference for SQL, is m_mysql loaded and configured properly?"; return EVENT_CONTINUE; } @@ -442,7 +442,7 @@ class DBMySQL : public Module NickCore *nc = findcore(r.Get(i, "display")); if (!nc) { - Alog() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display"); + Log() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display"); continue; } @@ -455,7 +455,7 @@ class DBMySQL : public Module NickCore *nc = findcore(r.Get(i, "display")); if (!nc) { - Alog() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display"); + Log() << "MySQL: Got NickCore access entry for nonexistant core " << r.Get(i, "display"); continue; } @@ -470,7 +470,7 @@ class DBMySQL : public Module NickCore *nc = findcore(r.Get(i, "display")); if (!nc) { - Alog() << "MySQL: Got NickAlias for nick " << r.Get(i, "nick") << " with nonexistant core " << r.Get(i, "display"); + Log() << "MySQL: Got NickAlias for nick " << r.Get(i, "nick") << " with nonexistant core " << r.Get(i, "display"); continue; } @@ -502,7 +502,7 @@ class DBMySQL : public Module NickAlias *na = findnick(r.Get(i, "nick")); if (!na) { - Alog() << "MySQL: Got metadata for nonexistant nick " << r.Get(i, "nick"); + Log() << "MySQL: Got metadata for nonexistant nick " << r.Get(i, "nick"); continue; } @@ -516,9 +516,7 @@ class DBMySQL : public Module { BotInfo *bi = findbot(r.Get(i, "nick")); if (!bi) - bi = new BotInfo(r.Get(i, "nick")); - bi->SetIdent(r.Get(i, "user")); - bi->host = r.Get(i, "host"); + bi = new BotInfo(r.Get(i, "nick"), r.Get(i, "user"), r.Get(i, "host")); bi->realname = r.Get(i, "rname"); bi->created = r.Get(i, "created").is_pos_number_only() ? convertTo<time_t>(r.Get(i, "creeated")) : time(NULL); @@ -543,7 +541,7 @@ class DBMySQL : public Module BotInfo *bi = findbot(r.Get(i, "botname")); if (!bi) { - Alog() << "MySQL: BotInfo metadata for nonexistant bot " << r.Get(i, "botname"); + Log() << "MySQL: BotInfo metadata for nonexistant bot " << r.Get(i, "botname"); continue; } @@ -562,7 +560,7 @@ class DBMySQL : public Module nc = findcore(r.Get(i, "founder")); if (!nc) { - Alog() << "MySQL: Channel " << r.Get(i, "name") << " with nonexistant founder " << r.Get(i, "founder"); + Log() << "MySQL: Channel " << r.Get(i, "name") << " with nonexistant founder " << r.Get(i, "founder"); continue; } @@ -664,7 +662,7 @@ class DBMySQL : public Module ChannelInfo *ci = cs_findchan(r.Get(i, "channel")); if (!ci) { - Alog() << "MySQL: Channel ttb for nonexistant channel " << r.Get(i, "channel"); + Log() << "MySQL: Channel ttb for nonexistant channel " << r.Get(i, "channel"); continue; } @@ -677,7 +675,7 @@ class DBMySQL : public Module ChannelInfo *ci = cs_findchan(r.Get(i, "channel")); if (!ci) { - Alog() << "MySQL: Channel badwords entry for nonexistant channel " << r.Get(i, "channel"); + Log() << "MySQL: Channel badwords entry for nonexistant channel " << r.Get(i, "channel"); continue; } @@ -697,14 +695,14 @@ class DBMySQL : public Module ChannelInfo *ci = cs_findchan(r.Get(i, "channel")); if (!ci) { - Alog() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel"); + Log() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel"); continue; } NickCore *nc = findcore(r.Get(i, "display")); if (!nc) { - Alog() << "MySQL: Channel access entry for " << ci->name << " with nonexistant nick " << r.Get(i, "display"); + Log() << "MySQL: Channel access entry for " << ci->name << " with nonexistant nick " << r.Get(i, "display"); continue; } @@ -717,7 +715,7 @@ class DBMySQL : public Module ChannelInfo *ci = cs_findchan(r.Get(i, "channel")); if (!ci) { - Alog() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel"); + Log() << "MySQL: Channel access entry for nonexistant channel " << r.Get(i, "channel"); continue; } @@ -750,7 +748,7 @@ class DBMySQL : public Module ChannelInfo *ci = cs_findchan(r.Get(i, "channel")); if (!ci) { - Alog() << "MySQL: Channel level entry for nonexistant channel " << r.Get(i, "channel"); + Log() << "MySQL: Channel level entry for nonexistant channel " << r.Get(i, "channel"); continue; } @@ -763,7 +761,7 @@ class DBMySQL : public Module ChannelInfo *ci = cs_findchan(r.Get(i, "channel")); if (!ci) { - Alog() << "MySQL: Channel metadata for nonexistant channel " << r.Get(i, "channel"); + Log() << "MySQL: Channel metadata for nonexistant channel " << r.Get(i, "channel"); continue; } @@ -1379,15 +1377,15 @@ class DBMySQL : public Module void MySQLInterface::OnResult(const SQLResult &r) { - Alog(LOG_DEBUG) << "MySQL successfully executed query: " << r.GetQuery(); + Log(LOG_DEBUG) << "MySQL successfully executed query: " << r.GetQuery(); } void MySQLInterface::OnError(const SQLResult &r) { if (!r.GetQuery().empty()) - Alog(LOG_DEBUG) << "Error executing query " << r.GetQuery() << ": " << r.GetError(); + Log(LOG_DEBUG) << "Error executing query " << r.GetQuery() << ": " << r.GetError(); else - Alog(LOG_DEBUG) << "Error executing query: " << r.GetError(); + Log(LOG_DEBUG) << "Error executing query: " << r.GetError(); } diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp index cb23b0e11..9b1218113 100644 --- a/modules/extra/hs_request.cpp +++ b/modules/extra/hs_request.cpp @@ -139,7 +139,7 @@ class CommandHSRequest : public Command me->NoticeLang(Config->s_HostServ, u, LNG_REQUESTED); req_send_memos(u, vIdent, hostmask); - Alog() << "New vHost Requested by " << nick; + Log(LOG_COMMAND, u, this, NULL) << "to request new vhost " << (!vIdent.empty() ? vIdent + "@" : "") << hostmask; } else notice_lang(Config->s_HostServ, u, HOST_NOREG, nick.c_str()); @@ -185,14 +185,14 @@ class CommandHSActivate : public Command if (it != Requests.end()) { na->hostinfo.SetVhost(it->second->ident, it->second->host, u->nick, it->second->time); - delete it->second; - Requests.erase(it); if (HSRequestMemoUser) my_memo_lang(u, na->nick, 2, LNG_ACTIVATE_MEMO); - me->NoticeLang(Config->s_HostServ, u, LNG_ACTIVATED, nick.c_str()); - Alog() << "Host Request for " << nick << " activated by " << u->nick; + me->NoticeLang(Config->s_HostServ, u, LNG_ACTIVATED, na->nick.c_str()); + Log(LOG_COMMAND, u, this, NULL) << "for " << na->nick << " for vhost " << (!it->second->ident.empty() ? it->second->ident + "@" : "") << it->second->host; + delete it->second; + Requests.erase(it); } else me->NoticeLang(Config->s_HostServ, u, LNG_NO_REQUEST, nick.c_str()); @@ -252,7 +252,7 @@ class CommandHSReject : public Command } me->NoticeLang(Config->s_HostServ, u, LNG_REJECTED, nick.c_str()); - Alog() << "Host Request for " << nick << " rejected by " << u->nick << " (" << (!reason.empty() ? reason : "") << ")"; + Log(LOG_COMMAND, u, this, NULL) << "to reject vhost for " << nick << " (" << (!reason.empty() ? reason : "") << ")"; } else me->NoticeLang(Config->s_HostServ, u, LNG_NO_REQUEST, nick.c_str()); @@ -737,7 +737,7 @@ void my_memo_lang(User *u, const Anope::string &name, int z, int number, ...) free(buf); // XXX } else - Alog() << me->name << ": INVALID language string call, language: [" << lang << "], String [" << number << "]"; + Log() << me->name << ": INVALID language string call, language: [" << lang << "], String [" << number << "]"; } void req_send_memos(User *u, const Anope::string &vIdent, const Anope::string &vHost) @@ -794,7 +794,7 @@ void my_load_config() HSRequestMemoOper = config.ReadFlag("hs_request", "memooper", "no", 0); HSRequestMemoSetters = config.ReadFlag("hs_request", "memosetters", "no", 0); - Alog(LOG_DEBUG) << "[hs_request] Set config vars: MemoUser=" << HSRequestMemoUser << " MemoOper=" << HSRequestMemoOper << " MemoSetters=" << HSRequestMemoSetters; + Log(LOG_DEBUG) << "[hs_request] Set config vars: MemoUser=" << HSRequestMemoUser << " MemoOper=" << HSRequestMemoOper << " MemoSetters=" << HSRequestMemoSetters; } MODULE_INIT(HSRequest) diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index 289273493..f641aa655 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -58,7 +58,7 @@ class MySQLResult : public SQLResult if (!num_fields) return; - Alog(LOG_DEBUG) << "SQL query returned " << num_fields << " fields"; + Log(LOG_DEBUG) << "SQL query returned " << num_fields << " fields"; for (MYSQL_ROW row; (row = mysql_fetch_row(res));) { @@ -70,7 +70,7 @@ class MySQLResult : public SQLResult for (unsigned field_count = 0; field_count < num_fields; ++field_count) { - Alog(LOG_DEBUG) << "Field count " << field_count << " name is: " << (fields[field_count].name ? fields[field_count].name : "") << ", data is: " << (row[field_count] ? row[field_count] : ""); + Log(LOG_DEBUG) << "Field count " << field_count << " name is: " << (fields[field_count].name ? fields[field_count].name : "") << ", data is: " << (row[field_count] ? row[field_count] : ""); Anope::string column = (fields[field_count].name ? fields[field_count].name : ""); Anope::string data = (row[field_count] ? row[field_count] : ""); @@ -211,7 +211,7 @@ class ModuleSQL : public Module if (i == num) { - Alog() << "MySQL: Removing server connection " << cname; + Log(LOG_NORMAL, "mysql") << "MySQL: Removing server connection " << cname; delete s; this->MySQLServices.erase(cname); @@ -235,11 +235,11 @@ class ModuleSQL : public Module MySQLService *ss = new MySQLService(this, connname, database, server, user, password, port); this->MySQLServices.insert(std::make_pair(connname, ss)); - Alog() << "MySQL: Sucessfully connected to server " << connname << " (" << server << ")"; + Log(LOG_NORMAL, "mysql") << "MySQL: Sucessfully connected to server " << connname << " (" << server << ")"; } catch (const SQLException &ex) { - Alog() << "MySQL: " << ex.GetReason(); + Log(LOG_NORMAL, "mysql") << "MySQL: " << ex.GetReason(); } } } diff --git a/modules/extra/m_ssl.cpp b/modules/extra/m_ssl.cpp index 397facd7d..5e081c193 100644 --- a/modules/extra/m_ssl.cpp +++ b/modules/extra/m_ssl.cpp @@ -84,7 +84,7 @@ class SSLModule : public Module } } else - Alog() << "m_ssl: No certificate file found"; + Log() << "m_ssl: No certificate file found"; if (IsFile(KEYFILE)) { @@ -102,7 +102,7 @@ class SSLModule : public Module throw ModuleException("Error loading private key - file not found"); } else - Alog() << "m_ssl: No private key found"; + Log() << "m_ssl: No private key found"; } this->SetAuthor("Anope"); @@ -129,11 +129,11 @@ class SSLModule : public Module try { new SSLSocket(u->host, u->port, Config->LocalHost, u->ipv6); - Alog() << "Connected to Server " << Number << " (" << u->host << ":" << u->port << ")"; + Log() << "Connected to Server " << Number << " (" << u->host << ":" << u->port << ")"; } catch (const SocketException &ex) { - Alog() << "Unable to connect with SSL to server" << Number << " (" << u->host << ":" << u->port << "), " << ex.GetReason(); + Log() << "Unable to connect with SSL to server" << Number << " (" << u->host << ":" << u->port << "), " << ex.GetReason(); } return EVENT_ALLOW; diff --git a/modules/extra/ns_maxemail.cpp b/modules/extra/ns_maxemail.cpp index a82798916..26ee9a96d 100644 --- a/modules/extra/ns_maxemail.cpp +++ b/modules/extra/ns_maxemail.cpp @@ -163,7 +163,7 @@ void my_load_config() { ConfigReader config; NSEmailMax = config.ReadInteger("ns_maxemail", "maxemails", "0", 0, false); - Alog(LOG_DEBUG) << "[ns_maxemail] NSEmailMax set to " << NSEmailMax; + Log(LOG_DEBUG) << "[ns_maxemail] NSEmailMax set to " << NSEmailMax; } MODULE_INIT(NSMaxEmail) diff --git a/modules/extra/ns_set_misc.cpp b/modules/extra/ns_set_misc.cpp index 2d31c6b63..2d267f2c4 100644 --- a/modules/extra/ns_set_misc.cpp +++ b/modules/extra/ns_set_misc.cpp @@ -168,7 +168,7 @@ class NSSetMisc : public Module CommandInfo *info = new CommandInfo(cname, desc, showhidden); if (!this->Commands.insert(std::make_pair(cname, info)).second) { - Alog() << "ns_set_misc: Warning, unable to add duplicate entry " << cname; + Log() << "ns_set_misc: Warning, unable to add duplicate entry " << cname; delete info; continue; } diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index 5ac8ff065..5c9a35032 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -342,7 +342,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) { User *u = finduser(source); if (!u) - Alog(LOG_DEBUG) << "SJOIN for nonexistant user " << source << " on " << c->name; + Log(LOG_DEBUG) << "SJOIN for nonexistant user " << source << " on " << c->name; else { EventReturn MOD_RESULT; @@ -380,7 +380,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(ch); if (!cm) { - Alog() << "Receeved unknown mode prefix " << buf[0] << " in SJOIN string"; + Log() << "Receeved unknown mode prefix " << buf[0] << " in SJOIN string"; continue; } @@ -391,7 +391,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) User *u = finduser(buf); if (!u) { - Alog(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name; + Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name; continue; } @@ -662,7 +662,7 @@ int anope_event_ping(const Anope::string &source, int ac, const char **av) int anope_event_error(const Anope::string &source, int ac, const char **av) { if (ac >= 1) - Alog(LOG_DEBUG) << av[0]; + Log(LOG_DEBUG) << av[0]; return MOD_CONT; } diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index 453be6965..20b347899 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -392,7 +392,7 @@ int anope_event_fmode(const Anope::string &source, int ac, const char **av) { newav[o] = av[n]; ++o; - Alog(LOG_DEBUG) << "Param: " << newav[o - 1]; + Log(LOG_DEBUG) << "Param: " << newav[o - 1]; } ++n; } @@ -438,7 +438,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) if (!cm) { - Alog() << "Received unknown mode prefix " << buf[0] << " in FJOIN string"; + Log() << "Received unknown mode prefix " << buf[0] << " in FJOIN string"; buf.erase(buf.begin()); continue; } @@ -451,7 +451,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) User *u = finduser(buf); if (!u) { - Alog(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name; + Log(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name; continue; } @@ -526,7 +526,7 @@ int anope_event_topic(const Anope::string &source, int ac, const char **av) if (!c) { - Alog(LOG_DEBUG) << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; + Log(LOG_DEBUG) << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; return MOD_CONT; } @@ -628,7 +628,7 @@ int anope_event_setname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source; return MOD_CONT; } @@ -646,7 +646,7 @@ int anope_event_chgname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "FNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "FNAME for nonexistent user " << source; return MOD_CONT; } @@ -664,7 +664,7 @@ int anope_event_setident(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; + Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; return MOD_CONT; } @@ -682,7 +682,7 @@ int anope_event_chgident(const Anope::string &source, int ac, const char **av) u = finduser(av[0]); if (!u) { - Alog(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; + Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; return MOD_CONT; } @@ -700,7 +700,7 @@ int anope_event_sethost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source; return MOD_CONT; } @@ -755,7 +755,7 @@ int anope_event_chghost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "FHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "FHOST for nonexistent user " << source; return MOD_CONT; } diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 987590034..30d4f3600 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -417,7 +417,7 @@ int anope_event_fmode(const Anope::string &source, int ac, const char **av) { newav[o] = av[n]; ++o; - Alog(LOG_DEBUG) << "Param: " << newav[o - 1]; + Log(LOG_DEBUG) << "Param: " << newav[o - 1]; } ++n; } @@ -476,7 +476,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(buf[0]); if (!cm) { - Alog() << "Receeved unknown mode prefix " << buf[0] << " in FJOIN string"; + Log() << "Receeved unknown mode prefix " << buf[0] << " in FJOIN string"; buf.erase(buf.begin()); continue; } @@ -490,7 +490,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) User *u = finduser(buf); if (!u) { - Alog(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name; + Log(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name; continue; } @@ -575,7 +575,7 @@ int anope_event_topic(const Anope::string &source, int ac, const char **av) if (!c) { - Alog(LOG_DEBUG) << "debug: TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; + Log(LOG_DEBUG) << "debug: TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; return MOD_CONT; } @@ -660,7 +660,7 @@ int anope_event_setname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source; return MOD_CONT; } @@ -675,7 +675,7 @@ int anope_event_chgname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "FNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "FNAME for nonexistent user " << source; return MOD_CONT; } @@ -690,7 +690,7 @@ int anope_event_setident(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; + Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; return MOD_CONT; } @@ -705,7 +705,7 @@ int anope_event_chgident(const Anope::string &source, int ac, const char **av) u = finduser(av[0]); if (!u) { - Alog(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; + Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; return MOD_CONT; } @@ -720,7 +720,7 @@ int anope_event_sethost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source; return MOD_CONT; } @@ -791,7 +791,7 @@ int anope_event_chghost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "FHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "FHOST for nonexistent user " << source; return MOD_CONT; } @@ -1206,7 +1206,7 @@ int anope_event_endburst(const Anope::string &source, int ac, const char **av) u->RemoveMode(NickServ, UMODE_REGISTERED); } - Alog() << "Processed ENDBURST for " << s->GetName(); + Log(LOG_DEBUG) << "Processed ENDBURST for " << s->GetName(); s->Sync(true); return MOD_CONT; diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index 54c30d8df..1b6a582c0 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -415,7 +415,7 @@ int anope_event_fmode(const Anope::string &source, int ac, const char **av) { newav[o] = av[n]; ++o; - Alog(LOG_DEBUG) << "Param: " << newav[o - 1]; + Log(LOG_DEBUG) << "Param: " << newav[o - 1]; } ++n; } @@ -474,7 +474,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(buf[0]); if (!cm) { - Alog() << "Recieved unknown mode prefix " << buf[0] << " in FJOIN string"; + Log() << "Recieved unknown mode prefix " << buf[0] << " in FJOIN string"; buf.erase(buf.begin()); continue; } @@ -488,7 +488,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av) User *u = finduser(buf); if (!u) { - Alog(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name; + Log(LOG_DEBUG) << "FJOIN for nonexistant user " << buf << " on " << c->name; continue; } @@ -573,7 +573,7 @@ int anope_event_topic(const Anope::string &source, int ac, const char **av) if (!c) { - Alog(LOG_DEBUG) << "debug: TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; + Log(LOG_DEBUG) << "debug: TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; return MOD_CONT; } @@ -658,7 +658,7 @@ int anope_event_setname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source; return MOD_CONT; } @@ -673,7 +673,7 @@ int anope_event_chgname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "FNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "FNAME for nonexistent user " << source; return MOD_CONT; } @@ -688,7 +688,7 @@ int anope_event_setident(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; + Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; return MOD_CONT; } @@ -702,7 +702,7 @@ int anope_event_chgident(const Anope::string &source, int ac, const char **av) if (!u) { - Alog(LOG_DEBUG) << "FIDENT for nonexistent user " << source; + Log(LOG_DEBUG) << "FIDENT for nonexistent user " << source; return MOD_CONT; } @@ -717,7 +717,7 @@ int anope_event_sethost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source; return MOD_CONT; } @@ -788,7 +788,7 @@ int anope_event_chghost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "FHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "FHOST for nonexistent user " << source; return MOD_CONT; } @@ -974,7 +974,7 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av) if (cm) ModeManager::AddChannelMode(cm); else - Alog() << "Unrecognized mode string in CAPAB CHANMODES: " << capab; + Log() << "Unrecognized mode string in CAPAB CHANMODES: " << capab; } } else if (!strcasecmp(av[0], "USERMODES")) @@ -1030,7 +1030,7 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av) if (um) ModeManager::AddUserMode(um); else - Alog() << "Unrecognized mode string in CAPAB USERMODES: " << capab; + Log() << "Unrecognized mode string in CAPAB USERMODES: " << capab; } } else if (!strcasecmp(av[0], "MODULES")) @@ -1179,7 +1179,7 @@ int anope_event_endburst(const Anope::string &source, int ac, const char **av) u->RemoveMode(NickServ, UMODE_REGISTERED); } - Alog() << "Processed ENDBURST for " << s->GetName(); + Log(LOG_DEBUG) << "Processed ENDBURST for " << s->GetName(); s->Sync(true); return MOD_CONT; diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index dc039682e..b45f1121a 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -102,7 +102,7 @@ void ratbox_cmd_pass(const Anope::string &pass) send_cmd("", "PASS %s TS 6 :%s", pass.c_str(), TS6SID.c_str()); } -class RatboxProto : public IRCDTS6Proto +class RatboxProto : public IRCDProto { void SendGlobopsInternal(BotInfo *source, const Anope::string &buf) { @@ -327,7 +327,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(ch); if (!cm) { - Alog() << "Received unknown mode prefix " << buf[0] << " in SJOIN string"; + Log() << "Received unknown mode prefix " << buf[0] << " in SJOIN string"; continue; } @@ -338,7 +338,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) User *u = finduser(buf); if (!u) { - Alog(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name; + Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name; continue; } @@ -443,7 +443,7 @@ int anope_event_topic(const Anope::string &source, int ac, const char **av) if (!c) { - Alog(LOG_DEBUG) << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; + Log(LOG_DEBUG) << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; return MOD_CONT; } @@ -487,7 +487,7 @@ int anope_event_tburst(const Anope::string &source, int ac, const char **av) if (!c) { - Alog(LOG_DEBUG) << "debug: TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; + Log(LOG_DEBUG) << "debug: TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0]; return MOD_CONT; } @@ -721,7 +721,7 @@ int anope_event_bmask(const Anope::string &source, int ac, const char **av) int anope_event_error(const Anope::string &source, int ac, const char **av) { if (ac >= 1) - Alog(LOG_DEBUG) << av[0]; + Log(LOG_DEBUG) << av[0]; return MOD_CONT; } diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp index cb1949cb7..5304e9d83 100644 --- a/modules/protocol/unreal32.cpp +++ b/modules/protocol/unreal32.cpp @@ -735,7 +735,7 @@ int anope_event_setname(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETNAME for nonexistent user " << source; + Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source; return MOD_CONT; } @@ -753,7 +753,7 @@ int anope_event_chgname(const Anope::string &source, int ac, const char **av) u = finduser(av[0]); if (!u) { - Alog(LOG_DEBUG) << "CHGNAME for nonexistent user " << av[0]; + Log(LOG_DEBUG) << "CHGNAME for nonexistent user " << av[0]; return MOD_CONT; } @@ -771,7 +771,7 @@ int anope_event_setident(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; + Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source; return MOD_CONT; } @@ -789,7 +789,7 @@ int anope_event_chgident(const Anope::string &source, int ac, const char **av) u = finduser(av[0]); if (!u) { - Alog(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; + Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0]; return MOD_CONT; } @@ -807,7 +807,7 @@ int anope_event_sethost(const Anope::string &source, int ac, const char **av) u = finduser(source); if (!u) { - Alog(LOG_DEBUG) << "SETHOST for nonexistent user " << source; + Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source; return MOD_CONT; } @@ -920,7 +920,7 @@ int anope_event_chghost(const Anope::string &source, int ac, const char **av) u = finduser(av[0]); if (!u) { - Alog(LOG_DEBUG) << "debug: CHGHOST for nonexistent user " << av[0]; + Log(LOG_DEBUG) << "debug: CHGHOST for nonexistent user " << av[0]; return MOD_CONT; } @@ -972,9 +972,9 @@ int anope_event_error(const Anope::string &source, int ac, const char **av) { if (av[0]) { - Alog(LOG_DEBUG) << av[0]; + Log(LOG_DEBUG) << av[0]; if (strstr(av[0], "No matching link configuration")) - Alog() << "Error: Your IRCD's link block may not be setup correctly, please check unrealircd.conf"; + Log() << "Error: Your IRCD's link block may not be setup correctly, please check unrealircd.conf"; } return MOD_CONT; } @@ -1063,7 +1063,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) ChannelMode *cm = ModeManager::FindChannelModeByChar(ch); if (!cm) { - Alog() << "Received unknown mode prefix " << buf[0] << " in SJOIN string"; + Log() << "Received unknown mode prefix " << buf[0] << " in SJOIN string"; continue; } @@ -1074,7 +1074,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av) User *u = finduser(buf); if (!u) { - Alog(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name; + Log(LOG_DEBUG) << "SJOIN for nonexistant user " << buf << " on " << c->name; continue; } diff --git a/modules/socketengines/m_socketengine_epoll.cpp b/modules/socketengines/m_socketengine_epoll.cpp index 9fadb22a1..4b38fc657 100644 --- a/modules/socketengines/m_socketengine_epoll.cpp +++ b/modules/socketengines/m_socketengine_epoll.cpp @@ -20,7 +20,7 @@ class SocketEngineEPoll : public SocketEngineBase if (max <= 0) { - Alog() << "Can't determine maximum number of open sockets"; + Log() << "Can't determine maximum number of open sockets"; throw ModuleException("Can't determine maximum number of open sockets"); } @@ -28,7 +28,7 @@ class SocketEngineEPoll : public SocketEngineBase if (EngineHandle == -1) { - Alog() << "Could not initialize epoll socket engine: " << strerror(errno); + Log() << "Could not initialize epoll socket engine: " << strerror(errno); throw ModuleException(Anope::string("Could not initialize epoll socket engine: ") + strerror(errno)); } @@ -52,7 +52,7 @@ class SocketEngineEPoll : public SocketEngineBase if (epoll_ctl(EngineHandle, EPOLL_CTL_ADD, ev.data.fd, &ev) == -1) { - Alog() << "Unable to add fd " << ev.data.fd << " to socketengine epoll: " << strerror(errno); + Log() << "Unable to add fd " << ev.data.fd << " to socketengine epoll: " << strerror(errno); return; } @@ -71,7 +71,7 @@ class SocketEngineEPoll : public SocketEngineBase if (epoll_ctl(EngineHandle, EPOLL_CTL_DEL, ev.data.fd, &ev) == -1) { - Alog() << "Unable to delete fd " << ev.data.fd << " from socketengine epoll: " << strerror(errno); + Log() << "Unable to delete fd " << ev.data.fd << " from socketengine epoll: " << strerror(errno); return; } @@ -90,7 +90,7 @@ class SocketEngineEPoll : public SocketEngineBase ev.data.fd = s->GetSock(); if (epoll_ctl(EngineHandle, EPOLL_CTL_MOD, ev.data.fd, &ev) == -1) - Alog() << "Unable to mark fd " << ev.data.fd << " as writable in socketengine epoll: " << strerror(errno); + Log() << "Unable to mark fd " << ev.data.fd << " as writable in socketengine epoll: " << strerror(errno); } void ClearWriteable(Socket *s) @@ -103,7 +103,7 @@ class SocketEngineEPoll : public SocketEngineBase ev.data.fd = s->GetSock(); if (epoll_ctl(EngineHandle, EPOLL_CTL_MOD, ev.data.fd, &ev) == -1) - Alog() << "Unable to mark fd " << ev.data.fd << " as unwritable in socketengine epoll: " << strerror(errno); + Log() << "Unable to mark fd " << ev.data.fd << " as unwritable in socketengine epoll: " << strerror(errno); } void Process() @@ -112,7 +112,7 @@ class SocketEngineEPoll : public SocketEngineBase if (total == -1) { - Alog() << "SockEngine::Process(): error " << strerror(errno); + Log() << "SockEngine::Process(): error " << strerror(errno); return; } diff --git a/modules/socketengines/m_socketengine_select.cpp b/modules/socketengines/m_socketengine_select.cpp index 72b851780..eb5ddab1a 100644 --- a/modules/socketengines/m_socketengine_select.cpp +++ b/modules/socketengines/m_socketengine_select.cpp @@ -65,7 +65,7 @@ class SocketEngineSelect : public SocketEngineBase #ifdef WIN32 errno = WSAGetLastError(); #endif - Alog() << "SockEngine::Process(): error" << strerror(errno); + Log() << "SockEngine::Process(): error" << strerror(errno); } else if (sresult) { |