From 9fb4cb8d3355fb6d80b18f1a6b6d65106720a428 Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 8 Jul 2006 18:37:01 +0000 Subject: Add usermode +o, with special checking so that an oper may only remove the mode not set it (on himself or others) - Finish off facility for oper-only user and channel modes git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4183 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/mode.cpp | 9 +++++++++ src/modes/umode_o.cpp | 29 +++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/modes/umode_o.cpp (limited to 'src') diff --git a/src/mode.cpp b/src/mode.cpp index cecb7b703..25c98fd1a 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -61,6 +61,8 @@ using namespace std; #include "modes/umode_w.h" /* +i (invisible) */ #include "modes/umode_i.h" +/* +o (operator) */ +#include "modes/umode_o.h" extern int MODCOUNT; extern std::vector modules; @@ -376,6 +378,12 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server } } + /* It's an oper only mode, check if theyre an oper. If they arent, + * eat any parameter that came with the mode, and continue to next + */ + if ((modehandlers[handler_id]->NeedsOper()) && (!*user->oper)) + continue; + /* Call the handler for the mode */ ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding); @@ -551,6 +559,7 @@ ModeParser::ModeParser() this->AddMode(new ModeUserServerNotice, 's'); this->AddMode(new ModeUserWallops, 'w'); this->AddMode(new ModeUserInvisible, 'i'); + this->AddMode(new ModeUserOperator, 'o'); /* TODO: User modes +swio */ } diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp new file mode 100644 index 000000000..2ce1fe5c5 --- /dev/null +++ b/src/modes/umode_o.cpp @@ -0,0 +1,29 @@ +#include "inspircd.h" +#include "mode.h" +#include "channels.h" +#include "users.h" +#include "modes/umode_o.h" + +ModeUserOperator::ModeUserOperator() : ModeHandler('o', 0, 0, false, MODETYPE_USER, true) +{ +} + +ModeAction ModeUserOperator::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +{ + /* Only opers can execute this class at all */ + if (!*source->oper) + return MODEACTION_DENY; + + /* Not even opers can GIVE the +o mode, only take it away */ + if (adding) + return MODEACTION_DENY; + + /* Set the bitfields. + * Note that oper status is only given in cmd_oper.cpp + * NOT here. It is impossible to directly set +o without + * verifying as an oper and getting an opertype assigned + * to your userrec! + */ + dest->modes[UM_OPERATOR] = 0; + return MODEACTION_ALLOW; +} -- cgit v1.2.3