Fix sqllog compile error

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

diff --git a/src/mode.cpp b/src/mode.cpp
index 03d0b52696064d318b9134c52075980cfb69bdf7..7d99277df1702b506ba8695899d3218d6d01c661 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "inspstring.h"
 
@@ -36,8 +34,6 @@
 #include "modes/cmode_l.h"
 /* +o (channel op) */
 #include "modes/cmode_o.h"
-/* +h (channel halfop) */
-#include "modes/cmode_h.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
 /* +w (see wallops) */
@@ -50,15 +46,23 @@
 #include "modes/umode_s.h"
 
 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), name(Name)
+       : ServiceProvider(Creator, Name, type == MODETYPE_CHANNEL ? SERVICE_CMODE : SERVICE_UMODE), m_paramtype(TR_TEXT),
+       parameters_taken(Params), mode(modeletter), prefix(0), oper(false),
+       list(false), m_type(type), count(0), levelrequired(HALFOP_VALUE)
 {
 }
 
-ModeHandler::~ModeHandler()
+CullResult ModeHandler::cull()
 {
-       if (ServerInstance)
+       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()
@@ -96,11 +100,6 @@ int ModeHandler::GetNumParams(bool adding)
        return 0;
 }
 
-char ModeHandler::GetModeChar()
-{
-       return mode;
-}
-
 std::string ModeHandler::GetUserParameter(User* user)
 {
        return "";
@@ -116,18 +115,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*)
 {
 }
@@ -190,6 +177,25 @@ ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Chan
        return MODEACTION_DENY;
 }
 
+ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+{
+       if (adding && !ParamValidate(parameter))
+               return MODEACTION_DENY;
+       std::string now = channel->GetModeParameter(this);
+       if (parameter == now)
+               return MODEACTION_DENY;
+       if (adding)
+               channel->SetModeParam(this, parameter);
+       else
+               channel->SetModeParam(this, "");
+       return MODEACTION_ALLOW;
+}
+
+bool ParamChannelModeHandler::ParamValidate(std::string& parameter)
+{
+       return true;
+}
+
 ModeWatcher::ModeWatcher(Module* Creator, char modeletter, ModeType type)
        : mode(modeletter), m_type(type), creator(Creator)
 {
@@ -331,7 +337,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
                {
@@ -660,7 +666,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.
@@ -763,40 +769,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 */
@@ -844,7 +816,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;
@@ -867,7 +839,7 @@ std::string ModeParser::BuildPrefixes()
                mprefixes = mprefixes + n->second.second;
        }
 
-       return "(" + mprefixes + ")" + mletters;
+       return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;
 }
 
 bool ModeParser::AddModeWatcher(ModeWatcher* mw)
@@ -1022,7 +994,4 @@ ModeParser::ModeParser()
 
 ModeParser::~ModeParser()
 {
-       ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
-       if (mh)
-               delete mh;
 }