ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 20:19:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge 7719, 7720

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@7721 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2007-08-15 18:13:49 +00:00
parent fa03880e73
commit 081a0a9a81
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/m_messageflood.cpp
View File

@ -216,11 +216,11 @@ class ModuleMsgFlood : public Module
throw ModuleException("Could not add new modes!");
}
void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
int ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
{
if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
{
return;
return 0;
}
floodsettings *f;
@ -254,25 +254,30 @@ class ModuleMsgFlood : public Module
char kickmessage[MAXBUF];
snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
if (!dest->ServerKickUser(user, kickmessage, true))
{
delete dest;
return 1;
}
}
}
return 0;
}
virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
virtual int OnUserPreMessage(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
if (target_type == TYPE_CHANNEL)
{
ProcessMessages(user,(chanrec*)dest,text);
}
return ProcessMessages(user,(chanrec*)dest,text);
return 0;
}
virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
virtual int OnUserPreNotice(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
{
if (target_type == TYPE_CHANNEL)
{
ProcessMessages(user,(chanrec*)dest,text);
}
return ProcessMessages(user,(chanrec*)dest,text);
return 0;
}
void OnChannelDelete(chanrec* chan)
@ -287,7 +292,7 @@ class ModuleMsgFlood : public Module
void Implements(char* List)
{
List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
}
virtual ~ModuleMsgFlood()

6
src/modules/m_nicklock.cpp
View File

@ -25,7 +25,7 @@ class cmd_nicklock : public command_t
{
char* dummy;
public:
cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
cmd_nicklock (InspIRCd* Instance) : command_t(Instance,"NICKLOCK", 'o', 2)
{
this->source = "m_nicklock.so";
syntax = "<oldnick> <newnick>";
@ -79,9 +79,9 @@ class cmd_nicklock : public command_t
class cmd_nickunlock : public command_t
{
public:
cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
cmd_nickunlock (InspIRCd* Instance) : command_t(Instance,"NICKUNLOCK", 'o', 1)
{
this->source = "m_nickunlock.so";
this->source = "m_nicklock.so";
syntax = "<locked-nick>";
}