From fd355973486299b3db37a4ec46125476f59db0ef Mon Sep 17 00:00:00 2001 From: brain Date: Mon, 19 May 2008 00:11:38 +0000 Subject: [PATCH] Fix these git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9752 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_banredirect.cpp | 12 ++++++------ src/modules/m_blockamsg.cpp | 4 ++-- src/modules/m_blockcaps.cpp | 2 +- src/modules/m_blockcolor.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index e9661c727..22c7c03b4 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -64,7 +64,7 @@ class BanRedirect : public ModeWatcher if(adding && (channel->bans.size() > static_cast(maxbans))) { - source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick, channel->name, channel->name, maxbans); + source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name, channel->name, maxbans); return false; } @@ -118,7 +118,7 @@ class BanRedirect : public ModeWatcher { if(irc::string(channel->name) == irc::string(mask[CHAN].c_str())) { - source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick, channel->name); + source->WriteNumeric(690, "%s %s :You cannot set a ban redirection to the channel the ban is on", source->nick.c_str(), channel->name); return false; } else @@ -170,7 +170,7 @@ class BanRedirect : public ModeWatcher } else { - source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick, channel->name, mask[CHAN].c_str()); + source->WriteNumeric(403, "%s %s :Invalid channel name in redirection (%s)", source->nick.c_str(), channel->name, mask[CHAN].c_str()); return false; } } @@ -298,13 +298,13 @@ class ModuleBanRedirect : public Module if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && destchan->limit && (destchan->GetUserCounter() >= destchan->limit)) { - user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick, chan->name); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name); return 1; } else { - user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick, chan->name); - user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick, redir->targetchan.c_str()); + user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name); + user->WriteNumeric(470, "%s :You are being automatically redirected to %s", user->nick.c_str(), redir->targetchan.c_str()); nofollow = true; Channel::JoinUser(ServerInstance, user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time()); nofollow = false; diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp index 17aad007f..500452fc4 100644 --- a/src/modules/m_blockamsg.cpp +++ b/src/modules/m_blockamsg.cpp @@ -137,12 +137,12 @@ class ModuleBlockAmsg : public Module { // Block it... if(action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick); + ServerInstance->SNO->WriteToSnoMask('A', "%s had an /amsg or /ame denied", user->nick.c_str()); if(action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) ServerInstance->Users->QuitUser(user, "Global message (/amsg or /ame) detected"); else if(action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS) - user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick); + user->WriteServ( "NOTICE %s :Global message (/amsg or /ame) detected", user->nick.c_str()); return 1; } diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index d45526df9..1fd9717d1 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -86,7 +86,7 @@ public: } if ( ((caps*100)/(int)text.length()) >= percent ) { - user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick, c->name, percent, minlen); + user->WriteServ( "404 %s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick.c_str(), c->name, percent, minlen); return 1; } } diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index 3e97f8287..d48fab5ba 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -63,7 +63,7 @@ class ModuleBlockColour : public Module case 21: case 22: case 31: - user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick, c->name); + user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick.c_str(), c->name); return 1; break; } -- 2.39.5