- Modify ServerConfig::GetFullProgDir to just return cwd, previously it did a lot...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 46272a2bdd1975a6c0bdcaa442d90aa1ce5ada21..cc334d4f7321d9749dfacfc37f44fb4715a0cb2d 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -104,11 +104,11 @@ std::string Event::GetEventID()
                Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
                Module::~Module() { }
 void           Module::OnUserConnect(userrec* user) { }
-void           Module::OnUserQuit(userrec* user, const std::string& message) { }
+void           Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { }
 void           Module::OnUserDisconnect(userrec* user) { }
-void           Module::OnUserJoin(userrec* user, chanrec* channel) { }
+void           Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { }
 void           Module::OnPostJoin(userrec* user, chanrec* channel) { }
-void           Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
+void           Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { }
 void           Module::OnRehash(userrec* user, const std::string &parameter) { }
 void           Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int            Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
@@ -134,7 +134,7 @@ void                Module::OnPostCommand(const std::string &command, const char** parameters,
 bool           Module::OnCheckReady(userrec* user) { return true; };
 int            Module::OnUserRegister(userrec* user) { return 0; };
 int            Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
-void           Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
+void           Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { };
 int            Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
 int            Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; };
 int            Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
@@ -164,9 +164,9 @@ void                Module::OnGetServerDescription(const std::string &servername,std::string &
 void           Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { };
 void           Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { };
 void           Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { };
-void           Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
-void           Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
-void           Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
+void           Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { };
+void           Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { };
+void           Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { };
 void           Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { };
 void           Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { };
 void           Module::OnWallops(userrec* user, const std::string &text) { };
@@ -188,7 +188,7 @@ void                Module::OnChannelDelete(chanrec* chan) { };
 Priority       Module::Prioritize() { return PRIORITY_DONTCARE; }
 void           Module::OnSetAway(userrec* user) { };
 void           Module::OnCancelAway(userrec* user) { };
-int            Module::OnUserList(userrec* user, chanrec* Ptr) { return 0; };
+int            Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; };
 int            Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; };
 void           Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { };
 void           Module::OnGarbageCollect() { };
@@ -378,7 +378,7 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter
 
 bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
 {
-       return this->Parser->CallHandler(commandname,parameters,pcnt,user);
+       return (this->Parser->CallHandler(commandname,parameters,pcnt,user) != CMD_INVALID);
 }
 
 bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user)
@@ -448,18 +448,6 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached)
        }
 }
 
-bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
-{
-       throw CoreException("The InspIRCd::UsertoPseudo function should not be used in InspIRCd later than 1.0.x");
-       return false;
-}
-
-bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
-{
-       throw CoreException("The InspIRCd::PseudotoUser function should not be used in InspIRCd later than 1.0.x");
-       return false;
-}
-
 void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
 {
        XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());