Collision tweaks

[user/henk/code/inspircd.git] / src / modes / cmode_l.cpp

diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp
index 185cbdedb93c0ff040e1bfd85659e35deb73d453..4ed95bc2cdb934e6f3333861d5a9a8bda153af3a 100644 (file)
--- a/src/modes/cmode_l.cpp
+++ b/src/modes/cmode_l.cpp
@@ -1,14 +1,45 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modes/cmode_l.h"
 
-ModeChannelLimit::ModeChannelLimit() : ModeHandler('l', 1, 0, false, MODETYPE_CHANNEL, false)
+ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, 'l', 1, 0, false, MODETYPE_CHANNEL, false)
+{
+}
+
+ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
+{
+       if (channel->limit)
+       {
+               return std::make_pair(true, ConvToStr(channel->limit));
+       }
+       else
+       {
+               return std::make_pair(false, parameter);
+       }
+}
+
+bool ModeChannelLimit::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
 {
+       /* When TS is equal, the higher channel limit wins */
+       return (atoi(their_param.c_str()) < atoi(our_param.c_str()));
 }
 
-ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        if (adding)
        {
@@ -36,6 +67,8 @@ ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanre
                        return MODEACTION_DENY;
                }
 
+               parameter = ConvToStr(limit);
+
                /* Set new limit */
                channel->limit = limit;
                channel->modes[CM_LIMIT] = 1;
@@ -59,6 +92,4 @@ ModeAction ModeChannelLimit::OnModeChange(userrec* source, userrec* dest, chanre
 
                return MODEACTION_ALLOW;
        }
-
-       return MODEACTION_DENY;
 }