Record module source file in the Module object

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

diff --git a/src/mode.cpp b/src/mode.cpp
index c8fecafa5f6d2cb48a81748ab6ea8a2730a15c55..cbd58021cb27d73fe57d2ff4aa68b7d650b5adbb 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -155,9 +155,9 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
+bool ModeHandler::CheckTimeStamp(std::string& theirs, const std::string& ours, Channel*)
 {
-       return (ours < theirs);
+       return (theirs < ours);
 }
 
 SimpleUserModeHandler::SimpleUserModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_USER, false)
@@ -471,7 +471,7 @@ ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool
        return MODEACTION_ALLOW;
 }
 
-void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode)
+void ModeParser::Process(const std::vector<std::string>& parameters, User *user, bool servermode, bool merge)
 {
        std::string target = parameters[0];
        Channel* targetchannel = ServerInstance->FindChan(target);
@@ -562,6 +562,13 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
                        /* Make sure the user isn't trying to slip in an invalid parameter */
                        if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos))
                                continue;
+                       if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode())
+                       {
+                               std::string ours = targetchannel->GetModeParameter(modechar);
+                               if (!mh->CheckTimeStamp(parameter, ours, targetchannel))
+                                       /* we won the mode merge, don't apply this mode */
+                                       continue;
+                       }
                }
 
                ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, servermode, SkipAccessChecks);
@@ -1079,19 +1086,22 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
                new ModeChannelPrivate(Instance),
                new ModeChannelModerated(Instance),
                new ModeChannelTopicOps(Instance),
+
                new ModeChannelNoExternal(Instance),
                new ModeChannelInviteOnly(Instance),
                new ModeChannelKey(Instance),
                new ModeChannelLimit(Instance),
+
                new ModeChannelBan(Instance),
                new ModeChannelOp(Instance),
                new ModeChannelHalfOp(Instance),
                new ModeChannelVoice(Instance),
+
                new ModeUserWallops(Instance),
                new ModeUserInvisible(Instance),
                new ModeUserOperator(Instance),
                new ModeUserServerNoticeMask(Instance),
-               NULL
+#define BUILTIN_MODE_COUNT 16
        };
 
        /* Clear mode handler list */
@@ -1101,9 +1111,25 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
        LastParse.clear();
 
        /* Initialise the RFC mode letters */
-       for (int index = 0; modes[index]; index++)
+       for (int index = 0; index < BUILTIN_MODE_COUNT; index++)
                this->AddMode(modes[index]);
 
        seq = 0;
        memset(&sent, 0, sizeof(sent));
 }
+
+ModeParser::~ModeParser()
+{
+       int count = 0;
+       for(int i=0; i < 256; i++)
+       {
+               ModeHandler* mh = modehandlers[i];
+               if (mh)
+               {
+                       count++;
+                       delete mh;
+               }
+       }
+       if (count != BUILTIN_MODE_COUNT)
+               throw CoreException("Mode handler found non-core modes remaining at deallocation");
+}