Minor change, param for local PING wasnt an SID and should be

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 2ee99f1aff446f89c5b99c1c430e6733ce4d945f..3767fbda9d0df1fe06cd482b10b7cbbdc567e6e0 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -936,7 +936,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {
                        for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
                        {
-                               if (ServerInstance->UnloadModule(removing->c_str()))
+                               if (ServerInstance->Modules->Unload(removing->c_str()))
                                {
                                        ServerInstance->WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
 
@@ -948,7 +948,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError());
                                }
                        }
                }
@@ -957,7 +957,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {
                        for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
                        {
-                               if (ServerInstance->LoadModule(adding->c_str()))
+                               if (ServerInstance->Modules->Load(adding->c_str()))
                                {
                                        ServerInstance->WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
 
@@ -969,7 +969,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError());
                                }
                        }
                }
@@ -1719,9 +1719,9 @@ InspIRCd* ServerConfig::GetInstance()
 std::string ServerConfig::GetSID()
 {
        std::string OurSID;
-       OurSID += (char)((Instance->Config->sid / 100) + 48);
-       OurSID += (char)((Instance->Config->sid / 10) % 10 + 48);
-       OurSID += (char)(Instance->Config->sid % 10 + 48);
+       OurSID += (char)((sid / 100) + 48);
+       OurSID += (char)((sid / 10) % 10 + 48);
+       OurSID += (char)(sid % 10 + 48);
        return OurSID;
 }
 
@@ -1777,4 +1777,3 @@ bool ValueItem::GetBool()
 {
        return (GetInteger() || v == "yes" || v == "true");
 }
-