* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
/** Handles channel mode +S
*/
-class ChannelStripColor : public ModeHandler
+class ChannelStripColor : public SimpleChannelModeHandler
{
public:
- ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode)
- {
- if (adding)
- {
- if (!channel->IsModeSet('S'))
- {
- channel->SetMode('S',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (channel->IsModeSet('S'))
- {
- channel->SetMode('S',false);
- return MODEACTION_ALLOW;
- }
- }
-
- return MODEACTION_DENY;
- }
+ ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, 'S') { }
};
/** Handles user mode +S
*/
-class UserStripColor : public ModeHandler
+class UserStripColor : public SimpleUserModeHandler
{
public:
- UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
-
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode)
- {
- /* Only opers can change other users modes */
- if (source != dest)
- return MODEACTION_DENY;
-
- if (adding)
- {
- if (!dest->IsModeSet('S'))
- {
- dest->SetMode('S',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (dest->IsModeSet('S'))
- {
- dest->SetMode('S',false);
- return MODEACTION_ALLOW;
- }
- }
-
- return MODEACTION_DENY;
- }
+ UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, 'S') { }
};
class ModuleStripColor : public Module
{
bool AllowChanOps;
- ChannelStripColor *csc;
- UserStripColor *usc;
-
+ ChannelStripColor csc;
+ UserStripColor usc;
+
public:
- ModuleStripColor(InspIRCd* Me) : Module(Me)
+ ModuleStripColor() : csc(this), usc(this)
{
- usc = new UserStripColor(ServerInstance);
- csc = new ChannelStripColor(ServerInstance);
-
- if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc))
+ if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc))
throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
- ServerInstance->Modules->Attach(eventlist, this, 2);
+ Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
-
virtual ~ModuleStripColor()
{
- ServerInstance->Modes->DelMode(usc);
- ServerInstance->Modes->DelMode(csc);
- delete usc;
- delete csc;
+ ServerInstance->Modes->DelMode(&usc);
+ ServerInstance->Modes->DelMode(&csc);
}
-
+
+ virtual void On005Numeric(std::string &output)
+ {
+ ServerInstance->AddExtBanChar('S');
+ }
+
virtual void ReplaceLine(std::string &sentence)
{
/* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
int seq = 0;
std::string::iterator i,safei;
- for (i = sentence.begin(); i != sentence.end(); ++i)
+ for (i = sentence.begin(); i != sentence.end();)
{
if ((*i == 3))
seq = 1;
- else if (seq && ( (*i >= '0') && (*i <= '9') || (*i == ',') ) )
+ else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
{
seq++;
if ( (seq <= 4) && (*i == ',') )
}
else
seq = 0;
-
+
if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
{
- safei = i;
- --i;
- sentence.erase(safei);
+ if (i != sentence.begin())
+ {
+ safei = i;
+ --i;
+ sentence.erase(safei);
+ ++i;
+ }
+ else
+ {
+ sentence.erase(i);
+ i = sentence.begin();
+ }
}
+ else
+ ++i;
}
}
- virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
if (!IS_LOCAL(user))
- return 0;
+ return MOD_RES_PASSTHRU;
bool active = false;
if (target_type == TYPE_USER)
// check if we allow ops to bypass filtering, if we do, check if they're opped accordingly.
// note: short circut logic here, don't wreck it. -- w00t
- if (CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) == STATUS_OP)
+ if (CHANOPS_EXEMPT('S') && t->GetPrefixValue(user) == OP_VALUE)
{
- return 0;
+ return MOD_RES_PASSTHRU;
}
- active = t->IsModeSet('S');
+ active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
}
if (active)
this->ReplaceLine(text);
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
-
- virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+
+ virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
}
-
+
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR, API_VERSION);
}
-
+
};
MODULE_INIT(ModuleStripColor)
projects / user / henk / code / inspircd.git / blobdiff