Remove AllowHalfop item from server config

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index 5bb1dab8e91d6d16ec2b37750ff3cdf423a60bf7..fd2517dce6da2d18ccb6b104bc201fb752d0585e 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "inspstring.h"
 
@@ -49,14 +47,23 @@
 /* +s (server notice masks) */
 #include "modes/umode_s.h"
 
-ModeHandler::ModeHandler(Module* Creator, char modeletter, ParamSpec Params, ModeType type)
+ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type)
        : m_paramtype(TR_TEXT), parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
-       list(false), m_type(type), count(0), levelrequired(HALFOP_VALUE), creator(Creator)
+       list(false), m_type(type), count(0), levelrequired(HALFOP_VALUE), creator(Creator), name(Name)
+{
+}
+
+CullResult ModeHandler::cull()
 {
+       if (ServerInstance->Modes)
+               ServerInstance->Modes->DelMode(this);
+       return classbase::cull();
 }
 
 ModeHandler::~ModeHandler()
 {
+       if (ServerInstance && ServerInstance->Modes && ServerInstance->Modes->FindMode(mode, m_type) == this)
+               ServerInstance->Logs->Log("MODE", ERROR, "ERROR: Destructor for mode %c called while still registered", mode);
 }
 
 bool ModeHandler::IsListMode()
@@ -114,18 +121,6 @@ ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
        return MODEACTION_DENY;
 }
 
-ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&)
-{
-       if (dest)
-       {
-               return std::make_pair(dest->IsModeSet(this->mode), "");
-       }
-       else
-       {
-               return std::make_pair(channel->IsModeSet(this->mode), "");
-       }
-}
-
 void ModeHandler::DisplayList(User*, Channel*)
 {
 }
@@ -329,7 +324,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
                if (IS_OPER(user))
                {
                        user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c",
-                                       user->nick.c_str(), irc::Spacify(user->oper.c_str()), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
+                                       user->nick.c_str(), user->oper->NameStr(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar);
                }
                else
                {
@@ -391,22 +386,15 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                return;
        }
 
-       std::string mode_sequence = parameters[1];
+       ModResult MOD_RESULT;
+       FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
 
        bool SkipAccessChecks = false;
 
-       if (!IS_LOCAL(user) || ServerInstance->ULine(user->server))
-       {
+       if (!IS_LOCAL(user) || ServerInstance->ULine(user->server) || MOD_RESULT == MOD_RES_ALLOW)
                SkipAccessChecks = true;
-       }
-       else
-       {
-               ModResult MOD_RESULT;
-               FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters));
-               if (MOD_RESULT == MOD_RES_DENY)
-                       return;
-               SkipAccessChecks = (MOD_RESULT == MOD_RES_ALLOW);
-       }
+       else if (MOD_RESULT == MOD_RES_DENY)
+               return;
 
        if (targetuser && !SkipAccessChecks && user != targetuser)
        {
@@ -414,6 +402,8 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                return;
        }
 
+       std::string mode_sequence = parameters[1];
+
        std::string output_mode;
        std::ostringstream output_parameters;
        LastParseParams.push_back(output_mode);
@@ -663,7 +653,7 @@ bool ModeParser::DelMode(ModeHandler* mh)
        mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
        pos = (mh->GetModeChar()-65) | mask;
 
-       if (!modehandlers[pos])
+       if (modehandlers[pos] != mh)
                return false;
 
        /* Note: We can't stack here, as we have modes potentially being removed across many different channels.
@@ -690,22 +680,6 @@ bool ModeParser::DelMode(ModeHandler* mh)
        return true;
 }
 
-void ModeParser::RemoveModes(Module* mod)
-{
-       for(int i=0; i < 256; i++)
-       {
-               ModeHandler* mh = modehandlers[i];
-               if (mh && mh->creator == mod)
-                       DelMode(mh);
-               for(unsigned int j=0; j < modewatchers[i].size(); j++)
-               {
-                       ModeWatcher* mw = modewatchers[i][j];
-                       if (mw && mw->creator == mod)
-                               DelModeWatcher(mw);
-               }
-       }
-}
-
 ModeHandler* ModeParser::FindMode(unsigned const char modeletter, ModeType mt)
 {
        unsigned char mask = 0;
@@ -782,40 +756,6 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter)
        return NULL;
 }
 
-std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffix)
-{
-       std::string types;
-       std::string pars;
-
-       if (!channel || !user)
-               return "";
-
-       for (unsigned char mode = 'A'; mode <= 'z'; mode++)
-       {
-               unsigned char pos = (mode-65) | MASK_CHANNEL;
-               ModeHandler* mh = modehandlers[pos];
-               if ((mh) && (mh->GetNumParams(true)) && (mh->GetNumParams(false)))
-               {
-                       ModePair ret;
-                       ret = mh->ModeSet(NULL, user, channel, user->nick);
-                       if ((ret.first) && (ret.second == user->nick))
-                       {
-                               if (nick_suffix)
-                               {
-                                       pars.append(" ");
-                                       pars.append(user->nick);
-                               }
-                               types.push_back(mh->GetModeChar());
-                       }
-               }
-       }
-
-       if (nick_suffix)
-               return types+pars;
-       else
-               return types;
-}
-
 std::string ModeParser::GiveModeList(ModeMasks m)
 {
        std::string type1;      /* Listmodes EXCEPT those with a prefix */
@@ -863,7 +803,7 @@ std::string ModeParser::GiveModeList(ModeMasks m)
        return type1 + "," + type2 + "," + type3 + "," + type4;
 }
 
-std::string ModeParser::BuildPrefixes()
+std::string ModeParser::BuildPrefixes(bool lettersAndModes)
 {
        std::string mletters;
        std::string mprefixes;
@@ -886,7 +826,7 @@ std::string ModeParser::BuildPrefixes()
                mprefixes = mprefixes + n->second.second;
        }
 
-       return "(" + mprefixes + ")" + mletters;
+       return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;
 }
 
 bool ModeParser::AddModeWatcher(ModeWatcher* mw)
@@ -1041,7 +981,10 @@ ModeParser::ModeParser()
 
 ModeParser::~ModeParser()
 {
-       ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+       ModeHandler* mh = FindMode('h', MODETYPE_CHANNEL);
        if (mh)
+       {
+               mh->cull();
                delete mh;
+       }
 }