Fix these

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9752 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index e9661c727cd0697148e8cae2ec76f13aecabc78e..22c7c03b40be5394b39cfe55ff56a944c92bbb56 100644 (file)
--- 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<unsigned>(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 17aad007ff7df6a36d40659f75b8a621719170d6..500452fc4e27345eab78e058b1c89e5611c68df8 100644 (file)
--- 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 d45526df9d63e53d2b67e49797c83b9de216a10f..1fd9717d1aec9f34e548bd6b924fb8854828c980 100644 (file)
--- 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 3e97f82877b6c7b85d4e65f69ef18a37a3c96acb..d48fab5bac10bf74014813fcca365cd5490b4b31 100644 (file)
--- 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;
                                        }