Commit these

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

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index e42d085cb6f3754a91d4134fc280b30d95001b85..007e6f8900c0d2070ce5ba64f0f3901eb8f3edf0 100644 (file)
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -93,9 +93,9 @@ class ModuleSafeList : public Module
 
                if (global_listing >= LimitList && !IS_OPER(user))
                {
-                       user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
-                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                       user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick.c_str());
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                        return 1;
                }
 
@@ -132,9 +132,9 @@ class ModuleSafeList : public Module
                {
                        if (ServerInstance->Time() < (*last_list_time)+ThrottleSecs)
                        {
-                               user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
-                               user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                               user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                               user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick.c_str());
+                               user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                               user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                                return 1;
                        }
 
@@ -153,7 +153,7 @@ class ModuleSafeList : public Module
                *llt = ServerInstance->Time();
                user->Extend("safelist_last", llt);
 
-               user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+               user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
                global_listing++;
 
@@ -188,7 +188,7 @@ class ModuleSafeList : public Module
                                        bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
                                        if ((users) && (display))
                                        {
-                                               int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick, users);
+                                               int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users);
                                                amount_sent += counter + ServerNameSize;
                                                user->WriteServ(std::string(buffer));
                                        }
@@ -198,7 +198,7 @@ class ModuleSafeList : public Module
                                        bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
                                        if ((users) && (display))
                                        {
-                                               int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic);
+                                               int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick.c_str(), chan->name, users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic);
                                                amount_sent += counter + ServerNameSize;
                                                user->WriteServ(std::string(buffer));
                                        }
@@ -210,7 +210,7 @@ class ModuleSafeList : public Module
                                                if (!ld->list_ended)
                                                {
                                                        ld->list_ended = true;
-                                                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                                                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                                                }
                                        }
                                }

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index da81712c62dac82b4d90ff2bef1c1926ae79f3bb..8b237674b2e01ce0774d4f030dd66dc7a46d8a3f 100644 (file)
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -34,7 +34,7 @@ class CommandSajoin : public Command
                {
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
                        if (!ServerInstance->IsChannel(parameters[1].c_str()))

diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 6cf7a5fbcb53ae895e962f097164c966095d877a..67b30b3ec380cf33d5443e14afedf4804ea5fcd4 100644 (file)
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -55,7 +55,7 @@ class CommandSamode : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick);
+                       user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick.c_str());
                }
 
                return CMD_FAILURE;

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index d9547f92def9bf3fbb94e957cf2860c9092474ca..cd93377c8a2b99911c417586978c0d5ffa785fb3 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -34,7 +34,7 @@ class CommandSanick : public Command
                {
                        if (ServerInstance->ULine(target->server))
                        {
-                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
                        std::string oldnick = user->nick;
@@ -54,14 +54,14 @@ class CommandSanick : public Command
                        }
                        else
                        {
-                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1].c_str());
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[1].c_str());
                        }
 
                        return CMD_FAILURE;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick, parameters[0].c_str());
+                       user->WriteServ("NOTICE %s :*** No such nickname: '%s'", user->nick.c_str(), parameters[0].c_str());
                }
 
                return CMD_FAILURE;

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 530d54fe0716b2e8ff82833c04e604f49ac9f8f3..40a4c54e59eb581f101495bb76fba9de8e2286e9 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -42,7 +42,7 @@ class CommandSapart : public Command
 
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
 
@@ -69,7 +69,7 @@ class CommandSapart : public Command
                                        }
                                        else
                                        {
-                                               user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1].c_str());
+                                               user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick.c_str(), dest->nick.c_str(), parameters[1].c_str());
                                                return CMD_FAILURE;
                                        }
                                }
@@ -83,7 +83,7 @@ class CommandSapart : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick);
+                       user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str());
                }
 
                return CMD_FAILURE;

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index ac986b1ec82542bf271c7f68ab869d5dbb5c66cc..91e792c8b72c1f4a1e384350790c94364d47a2c0 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -34,7 +34,7 @@ class CommandSaquit : public Command
                {
                        if (ServerInstance->ULine(dest->server))
                        {
-                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(990, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str());
                                return CMD_FAILURE;
                        }
                        
@@ -49,7 +49,7 @@ class CommandSaquit : public Command
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0].c_str());
+                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick.c_str(), parameters[0].c_str());
                }
 
                return CMD_FAILURE;

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index ffd6259ff274c3de9d1cce21981f24f3b662bde8..1ad51b1641b7e2b40b4215292983f9c6d12ed86c 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -134,13 +134,13 @@ class SaslAuthenticator : public classbase
                switch (this->result)
                {
                 case SASL_OK:
-                       this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick);
+                       this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str());
                        break;
                 case SASL_ABORT:
-                       this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick);
+                       this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str());
                        break;
                 case SASL_FAIL:
-                       this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick);
+                       this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick.c_str());
                        break;
                 default:
                        break;

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 1f9ac15e9a2f91ed4e896dc6b8bd0399d41b10bb..b86a35b7ffa91e1f071e4e98162e938681eccfcf 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -68,12 +68,12 @@ class ModuleSecureList : public Module
                                        return 0;
 
                        /* Not exempt, BOOK EM DANNO! */
-                       user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick, (unsigned long) WaitTime);
+                       user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick.c_str(), (unsigned long) WaitTime);
                        /* Some crap clients (read: mIRC, various java chat applets) muck up if they don't
                         * receive these numerics whenever they send LIST, so give them an empty LIST to mull over.
                         */
-                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                        return 1;
                }
                return 0;

diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index 6b8a33d73dc3ae955af37af0e9644646b2fd3df8..7f5d47d99dcc5fd9d0c2e8e3e0a457b5dd65a9ee 100644 (file)
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -41,7 +41,7 @@ class ModuleSeeNicks : public Module
 
        virtual void OnUserPostNick(User* user, const std::string &oldnick)
        {
-               ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N',"User %s changed their nickname to %s", oldnick.c_str(), user->nick);
+               ServerInstance->SNO->WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N',"User %s changed their nickname to %s", oldnick.c_str(), user->nick.c_str());
        }
 };