More WriteGlobalSno conversions in rehash, patch by dKingston

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

diff --git a/src/commands/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp
index d4cda20ab1356e51e5f788d98a021012cb704b0f..b7a774e36c68867dbee9f8630e85226971b0b7ba 100644 (file)
--- a/src/commands/cmd_loadmodule.cpp
+++ b/src/commands/cmd_loadmodule.cpp
@@ -40,7 +40,7 @@ CmdResult CommandLoadmodule::Handle (const std::vector<std::string>& parameters,
 {
        if (ServerInstance->Modules->Load(parameters[0].c_str()))
        {
-               ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "NEW MODULE: %s loaded %s",user->nick.c_str(), parameters[0].c_str());
                user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
                return CMD_SUCCESS;
        }

diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp
index 3e3a3a6178073954721b5988ec570ddf0bbbcaef..37693b501cdd6b0ec437fce5989d6a5ad4c84ef8 100644 (file)
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/commands/cmd_reloadmodule.cpp
@@ -39,16 +39,16 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
 
        if (ServerInstance->Modules->Unload(parameters[0].c_str()))
        {
-               ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s unloaded %s",user->nick.c_str(), parameters[0].c_str());
                if (ServerInstance->Modules->Load(parameters[0].c_str()))
                {
-                       ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s reloaded %s",user->nick.c_str(), parameters[0].c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s reloaded %s",user->nick.c_str(), parameters[0].c_str());
                        user->WriteNumeric(975, "%s %s :Module successfully reloaded.",user->nick.c_str(), parameters[0].c_str());
                        return CMD_SUCCESS;
                }
        }
 
-       ServerInstance->SNO->WriteToSnoMask('a', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick.c_str(), parameters[0].c_str());
+       ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s unsuccessfully reloaded %s",user->nick.c_str(), parameters[0].c_str());
        user->WriteNumeric(975, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
        return CMD_FAILURE;
 }

diff --git a/src/commands/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp
index bdc516aac923683dc862da1aa3329c7fed82f066..5aecd22ddef0d1f924d642a7c227846bcd618fd3 100644 (file)
--- a/src/commands/cmd_unloadmodule.cpp
+++ b/src/commands/cmd_unloadmodule.cpp
@@ -43,7 +43,7 @@ CmdResult CommandUnloadmodule::Handle (const std::vector<std::string>& parameter
                
        if (ServerInstance->Modules->Unload(parameters[0].c_str()))
        {
-               ServerInstance->SNO->WriteToSnoMask('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteGlobalSno('a', "MODULE UNLOADED: %s unloaded %s", user->nick.c_str(), parameters[0].c_str());
                user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str());
        }
        else

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 87ee8789b89b6dd23aa1f7bc6bfe7f32631b9455..ac0dc2596604ac760be6d9f425011ec88f29b5c7 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -1230,19 +1230,19 @@ void ServerConfig::ApplyModules(User* user)
                        continue;
                if (ServerInstance->Modules->Unload(removing->c_str()))
                {
-                       ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
                        if (user)
                                user->WriteNumeric(RPL_UNLOADEDMODULE, "%s %s :Module %s successfully unloaded.",user->nick.c_str(), removing->c_str(), removing->c_str());
                        else
-                               ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully unloaded.", removing->c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully unloaded.", removing->c_str());
                }
                else
                {
                        if (user)
                                user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s %s :Failed to unload module %s: %s",user->nick.c_str(), removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError().c_str());
                        else
-                                ServerInstance->SNO->WriteToSnoMask('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
+                                ServerInstance->SNO->WriteGlobalSno('a', "Failed to unload module %s: %s", removing->c_str(), ServerInstance->Modules->LastError().c_str());
                }
        }
 
@@ -1250,25 +1250,25 @@ void ServerConfig::ApplyModules(User* user)
        {
                if (ServerInstance->Modules->Load(adding->c_str()))
                {
-                       ServerInstance->SNO->WriteToSnoMask('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
                        if (user)
                                user->WriteNumeric(RPL_LOADEDMODULE, "%s %s :Module %s successfully loaded.",user->nick.c_str(), adding->c_str(), adding->c_str());
                        else
-                               ServerInstance->SNO->WriteToSnoMask('a', "Module %s successfully loaded.", adding->c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Module %s successfully loaded.", adding->c_str());
                }
                else
                {
                        if (user)
                                user->WriteNumeric(ERR_CANTLOADMODULE, "%s %s :Failed to load module %s: %s",user->nick.c_str(), adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError().c_str());
                        else
-                               ServerInstance->SNO->WriteToSnoMask('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Failed to load module %s: %s", adding->c_str(), ServerInstance->Modules->LastError().c_str());
                }
        }
 
        if (user)
                user->WriteServ("NOTICE %s :*** Successfully rehashed server.", user->nick.c_str());
        else
-               ServerInstance->SNO->WriteToSnoMask('a', "*** Successfully rehashed server.");
+               ServerInstance->SNO->WriteGlobalSno('a', "*** Successfully rehashed server.");
 }
 
 bool ServerConfig::LoadConf(FILE* &conf, const char* filename, bool allowexeinc)