Shrink users properly on quit, and make cloaks for all existing users on load, for...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1e8e0a7e9d22ac4aa2d084d9dcda263fa5f2e76f..8f50e0762a06cd8a0920c41c289b7e090ccc98fd 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -65,37 +65,6 @@ void ServerConfig::ClearStack()
        include_stack.clear();
 }
 
-Module* ServerConfig::GetIOHook(BufferedSocket* is)
-{
-       std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
-       return (x != SocketIOHookModule.end() ? x->second : NULL);
-}
-
-bool ServerConfig::AddIOHook(Module* iomod, BufferedSocket* is)
-{
-       if (!GetIOHook(is))
-       {
-               SocketIOHookModule[is] = iomod;
-               is->IsIOHooked = true;
-               return true;
-       }
-       else
-       {
-               throw ModuleException("BufferedSocket derived class already hooked by another module");
-       }
-}
-
-bool ServerConfig::DelIOHook(BufferedSocket* is)
-{
-       std::map<BufferedSocket*,Module*>::iterator x = SocketIOHookModule.find(is);
-       if (x != SocketIOHookModule.end())
-       {
-               SocketIOHookModule.erase(x);
-               return true;
-       }
-       return false;
-}
-
 void ServerConfig::Update005()
 {
        std::stringstream out(data005);
@@ -393,10 +362,10 @@ bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data)
        return true;
 }
 
-bool ValidateNotEmpty(ServerConfig*, const char* tag, const char*, ValueItem &data)
+bool ValidateNotEmpty(ServerConfig*, const char* tag, const char* val, ValueItem &data)
 {
        if (!*data.GetString())
-               throw CoreException(std::string("The value for ")+tag+" cannot be empty!");
+               throw CoreException(std::string("The value for <")+tag+":"+val+"> cannot be empty!");
        return true;
 }