m_override now has a 'requirekey' option, that requires a special key of 'override...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 6a870361bb17002e1177357754ca62c6ab8cd235..41e4e2606a3d84a2334bb3bbc841ec4b5e74f27d 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -106,8 +106,6 @@ std::string Event::GetEventID()
 
                Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
                Module::~Module() { }
-void           Module::OnReadConfig(ServerConfig*, ConfigReader*) { }
-int            Module::OnDownloadFile(const std::string&, std::istream*&) { return 0; }
 void           Module::OnUserConnect(User*) { }
 void           Module::OnUserQuit(User*, const std::string&, const std::string&) { }
 void           Module::OnUserDisconnect(User*) { }
@@ -116,7 +114,7 @@ void                Module::OnPostJoin(User*, Channel*) { }
 void           Module::OnUserPart(User*, Channel*, const std::string&, bool&) { }
 void           Module::OnRehash(User*, const std::string&) { }
 void           Module::OnServerRaw(std::string&, bool, User*) { }
-int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return 0; }
+int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
 void           Module::OnMode(User*, void*, int, const std::string&) { }
 Version                Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
 void           Module::OnOper(User*, const std::string&) { }
@@ -184,8 +182,7 @@ void                Module::OnExpireLine(XLine*) { }
 void           Module::OnCleanup(int, void*) { }
 int            Module::OnChannelPreDelete(Channel*) { return 0; }
 void           Module::OnChannelDelete(Channel*) { }
-void           Module::OnSetAway(User*) { }
-void           Module::OnCancelAway(User*) { }
+int            Module::OnSetAway(User*, const std::string &) { return 0; }
 int            Module::OnUserList(User*, Channel*, CUList*&) { return 0; }
 int            Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; }
 void           Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { }
@@ -195,6 +192,7 @@ void                Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
 void           Module::OnRunTestSuite() { }
 void           Module::OnNamesListItem(User*, User*, Channel*, std::string&, std::string&) { }
 int            Module::OnNumeric(User*, unsigned int, const std::string&) { return 0; }
+void           Module::OnHookUserIO(User*, const std::string&) { }
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
 {
@@ -381,7 +379,7 @@ bool ModuleManager::Load(const char* filename)
 
        if (!ServerConfig::DirValid(modfile))
        {
-               LastModuleError = "Module " + filename_str + " is not within the modules directory.";
+               LastModuleError = "Module " + std::string(filename) + " is not in the module directory that i am configured to look in (is "+Instance->Config->ModPath+" really a symlink?)";
                Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }