diff options
| -rw-r--r-- | include/modes/umode_o.h | 8 | ||||
| -rw-r--r-- | src/mode.cpp | 9 | ||||
| -rw-r--r-- | src/modes/umode_o.cpp | 29 |
3 files changed, 46 insertions, 0 deletions
diff --git a/include/modes/umode_o.h b/include/modes/umode_o.h new file mode 100644 index 000000000..fd389b4b0 --- /dev/null +++ b/include/modes/umode_o.h @@ -0,0 +1,8 @@ +#include "mode.h" + +class ModeUserOperator : public ModeHandler +{ + public: + ModeUserOperator(); + ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding); +}; 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<Module*> 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; +} |