From b57c7f4e466f72fdd2ac3deca42caa1ea7748338 Mon Sep 17 00:00:00 2001 From: w00t Date: Mon, 15 Oct 2007 20:59:05 +0000 Subject: In the grand tradition of huge fucking commits: - chanrec -> Channel - userrec -> User Enjoy. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8204 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules.cpp | 152 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'src/modules.cpp') diff --git a/src/modules.cpp b/src/modules.cpp index b95dcd59d..8da123b05 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -104,96 +104,96 @@ 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, const std::string &oper_message) { } -void Module::OnUserDisconnect(userrec* user) { } -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, bool &silent) { } -void Module::OnRehash(userrec* user, const std::string ¶meter) { } -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; } -void Module::OnMode(userrec* user, void* dest, int target_type, const std::string &text) { } +void Module::OnUserConnect(User* user) { } +void Module::OnUserQuit(User* user, const std::string& message, const std::string &oper_message) { } +void Module::OnUserDisconnect(User* user) { } +void Module::OnUserJoin(User* user, Channel* channel, bool &silent) { } +void Module::OnPostJoin(User* user, Channel* channel) { } +void Module::OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { } +void Module::OnRehash(User* user, const std::string ¶meter) { } +void Module::OnServerRaw(std::string &raw, bool inbound, User* user) { } +int Module::OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { return 0; } +void Module::OnMode(User* user, void* dest, int target_type, const std::string &text) { } Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } -void Module::OnOper(userrec* user, const std::string &opertype) { } -void Module::OnPostOper(userrec* user, const std::string &opertype) { } -void Module::OnInfo(userrec* user) { } -void Module::OnWhois(userrec* source, userrec* dest) { } -int Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; } -int Module::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } -int Module::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } -int Module::OnUserPreNick(userrec* user, const std::string &newnick) { return 0; } -void Module::OnUserPostNick(userrec* user, const std::string &oldnick) { } -int Module::OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) { return ACR_DEFAULT; } +void Module::OnOper(User* user, const std::string &opertype) { } +void Module::OnPostOper(User* user, const std::string &opertype) { } +void Module::OnInfo(User* user) { } +void Module::OnWhois(User* source, User* dest) { } +int Module::OnUserPreInvite(User* source,User* dest,Channel* channel) { return 0; } +int Module::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } +int Module::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text,char status, CUList &exempt_list) { return 0; } +int Module::OnUserPreNick(User* user, const std::string &newnick) { return 0; } +void Module::OnUserPostNick(User* user, const std::string &oldnick) { } +int Module::OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { return ACR_DEFAULT; } void Module::On005Numeric(std::string &output) { } -int Module::OnKill(userrec* source, userrec* dest, const std::string &reason) { return 0; } +int Module::OnKill(User* source, User* dest, const std::string &reason) { return 0; } void Module::OnLoadModule(Module* mod,const std::string &name) { } void Module::OnUnloadModule(Module* mod,const std::string &name) { } void Module::OnBackgroundTimer(time_t curtime) { } -int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { return 0; } -void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, CmdResult result, const std::string &original_line) { } -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, 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; } -int Module::OnCheckBan(userrec* user, chanrec* chan) { return 0; } -int Module::OnStats(char symbol, userrec* user, string_list &results) { return 0; } -int Module::OnChangeLocalUserHost(userrec* user, const std::string &newhost) { return 0; } -int Module::OnChangeLocalUserGECOS(userrec* user, const std::string &newhost) { return 0; } -int Module::OnLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { return 0; } +int Module::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { return 0; } +void Module::OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line) { } +bool Module::OnCheckReady(User* user) { return true; } +int Module::OnUserRegister(User* user) { return 0; } +int Module::OnUserPreKick(User* source, User* user, Channel* chan, const std::string &reason) { return 0; } +void Module::OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { } +int Module::OnCheckInvite(User* user, Channel* chan) { return 0; } +int Module::OnCheckKey(User* user, Channel* chan, const std::string &keygiven) { return 0; } +int Module::OnCheckLimit(User* user, Channel* chan) { return 0; } +int Module::OnCheckBan(User* user, Channel* chan) { return 0; } +int Module::OnStats(char symbol, User* user, string_list &results) { return 0; } +int Module::OnChangeLocalUserHost(User* user, const std::string &newhost) { return 0; } +int Module::OnChangeLocalUserGECOS(User* user, const std::string &newhost) { return 0; } +int Module::OnLocalTopicChange(User* user, Channel* chan, const std::string &topic) { return 0; } void Module::OnEvent(Event* event) { return; } char* Module::OnRequest(Request* request) { return NULL; } int Module::OnOperCompare(const std::string &password, const std::string &input, int tagnumber) { return 0; } -void Module::OnGlobalOper(userrec* user) { } -void Module::OnPostConnect(userrec* user) { } -int Module::OnAddBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; } -int Module::OnDelBan(userrec* source, chanrec* channel,const std::string &banmask) { return 0; } +void Module::OnGlobalOper(User* user) { } +void Module::OnPostConnect(User* user) { } +int Module::OnAddBan(User* source, Channel* channel,const std::string &banmask) { return 0; } +int Module::OnDelBan(User* source, Channel* channel,const std::string &banmask) { return 0; } void Module::OnRawSocketAccept(int fd, const std::string &ip, int localport) { } int Module::OnRawSocketWrite(int fd, const char* buffer, int count) { return 0; } void Module::OnRawSocketClose(int fd) { } void Module::OnRawSocketConnect(int fd) { } int Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; } -void Module::OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } -void Module::OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } -void Module::OnRemoteKill(userrec* source, userrec* dest, const std::string &reason, const std::string &operreason) { } -void Module::OnUserInvite(userrec* source,userrec* dest,chanrec* channel) { } -void Module::OnPostLocalTopicChange(userrec* user, chanrec* chan, const std::string &topic) { } +void Module::OnUserMessage(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } +void Module::OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list) { } +void Module::OnRemoteKill(User* source, User* dest, const std::string &reason, const std::string &operreason) { } +void Module::OnUserInvite(User* source,User* dest,Channel* channel) { } +void Module::OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic) { } void Module::OnGetServerDescription(const std::string &servername,std::string &description) { } -void Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { } -void Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { } +void Module::OnSyncUser(User* user, Module* proto, void* opaque) { } +void Module::OnSyncChannel(Channel* 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, bool displayable) { } -void Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { } +void Module::OnSyncChannelMetaData(Channel* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { } +void Module::OnSyncUserMetaData(User* 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) { } -void Module::OnChangeHost(userrec* user, const std::string &newhost) { } -void Module::OnChangeName(userrec* user, const std::string &gecos) { } -void Module::OnAddGLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnAddZLine(long duration, userrec* source, const std::string &reason, const std::string &ipmask) { } -void Module::OnAddKLine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnAddQLine(long duration, userrec* source, const std::string &reason, const std::string &nickmask) { } -void Module::OnAddELine(long duration, userrec* source, const std::string &reason, const std::string &hostmask) { } -void Module::OnDelGLine(userrec* source, const std::string &hostmask) { } -void Module::OnDelZLine(userrec* source, const std::string &ipmask) { } -void Module::OnDelKLine(userrec* source, const std::string &hostmask) { } -void Module::OnDelQLine(userrec* source, const std::string &nickmask) { } -void Module::OnDelELine(userrec* source, const std::string &hostmask) { } +void Module::OnWallops(User* user, const std::string &text) { } +void Module::OnChangeHost(User* user, const std::string &newhost) { } +void Module::OnChangeName(User* user, const std::string &gecos) { } +void Module::OnAddGLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnAddZLine(long duration, User* source, const std::string &reason, const std::string &ipmask) { } +void Module::OnAddKLine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnAddQLine(long duration, User* source, const std::string &reason, const std::string &nickmask) { } +void Module::OnAddELine(long duration, User* source, const std::string &reason, const std::string &hostmask) { } +void Module::OnDelGLine(User* source, const std::string &hostmask) { } +void Module::OnDelZLine(User* source, const std::string &ipmask) { } +void Module::OnDelKLine(User* source, const std::string &hostmask) { } +void Module::OnDelQLine(User* source, const std::string &nickmask) { } +void Module::OnDelELine(User* source, const std::string &hostmask) { } void Module::OnCleanup(int target_type, void* item) { } void Module::Implements(char* Implements) { for (int j = 0; j < 255; j++) Implements[j] = 0; } -void Module::OnChannelDelete(chanrec* chan) { } +void Module::OnChannelDelete(Channel* chan) { } Priority Module::Prioritize() { return PRIORITY_DONTCARE; } -void Module::OnSetAway(userrec* user) { } -void Module::OnCancelAway(userrec* user) { } -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, const std::string &text) { } +void Module::OnSetAway(User* user) { } +void Module::OnCancelAway(User* user) { } +int Module::OnUserList(User* user, Channel* Ptr, CUList* &userlist) { return 0; } +int Module::OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { return 0; } +void Module::OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { } void Module::OnGarbageCollect() { } -void Module::OnBufferFlushed(userrec* user) { } +void Module::OnBufferFlushed(User* user) { } ModuleManager::ModuleManager(InspIRCd* Ins) @@ -759,7 +759,7 @@ const std::string& ModuleManager::GetModuleName(Module* m) * m_safelist possible, initially). */ -chanrec* InspIRCd::GetChannelIndex(long index) +Channel* InspIRCd::GetChannelIndex(long index) { int target = 0; for (chan_hash::iterator n = this->chanlist->begin(); n != this->chanlist->end(); n++, target++) @@ -775,12 +775,12 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter return match(sliteral.c_str(),spattern.c_str()); } -CmdResult 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, User* user) { return this->Parser->CallHandler(commandname,parameters,pcnt,user); } -bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, userrec* user) +bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) { return this->Parser->IsValidCommand(commandname, pcnt, user); } @@ -794,12 +794,12 @@ void InspIRCd::AddCommand(Command *f) } } -void InspIRCd::SendMode(const char** parameters, int pcnt, userrec *user) +void InspIRCd::SendMode(const char** parameters, int pcnt, User *user) { this->Modes->Process(parameters,pcnt,user,true); } -void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstream &TextStream) +void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream) { std::string CompleteLine = LinePrefix; std::string Word; @@ -815,9 +815,9 @@ void InspIRCd::DumpText(userrec* User, const std::string &LinePrefix, stringstre User->WriteServ(CompleteLine); } -userrec* FindDescriptorHandler::Call(int socket) +User* FindDescriptorHandler::Call(int socket) { - return reinterpret_cast(Server->SE->GetRef(socket)); + return reinterpret_cast(Server->SE->GetRef(socket)); } bool InspIRCd::AddMode(ModeHandler* mh, const unsigned char mode) @@ -1044,7 +1044,7 @@ long ConfigReader::GetError() return olderr; } -void ConfigReader::DumpErrors(bool bail, userrec* user) +void ConfigReader::DumpErrors(bool bail, User* user) { ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user); } -- cgit v1.2.3