X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=b36b28a132f75153fde1470fd838eb6407ee3e69;hb=72948525ec3ef03fe46553349c1892cafa5ac18c;hp=7505dd21edf2fb814a7098446b49abbde4532fd9;hpb=be4c8f3f21f6b5c1a56a60d5843a62d5a3321039;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 7505dd21e..b36b28a13 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -21,7 +22,6 @@
 #include "socketengine.h"
 #include "command_parse.h"
 #include "dns.h"
-#include "inspircd.h"
 
 // version is a simple class for holding a modules version number
 Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
@@ -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,10 +188,11 @@ 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() { };
+void		Module::OnBufferFlushed(userrec* user) { };
 
 long InspIRCd::PriorityAfter(const std::string &modulename)
 {
@@ -375,7 +376,7 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter
 	return match(sliteral.c_str(),spattern.c_str());
 }
 
-bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
 {
 	return this->Parser->CallHandler(commandname,parameters,pcnt,user);
 }
@@ -447,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());