Include explicit parameter list in ProtocolInterface::SendMode

[user/henk/code/inspircd.git] / include / u_listmode.h

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 358ccbf8312346117ac15935afc95f9b9abe387c..1e7d1cceb21f7a8e18e0a11fca76b3e8c2f68774 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,10 +16,10 @@
 
 /** Get the time as a string
  */
-inline std::string stringtime()
+inline std::string stringtime(InspIRCd* Instance)
 {
        std::ostringstream TIME;
-       TIME << time(NULL); 
+       TIME << Instance->Time();
        return TIME.str();
 }
 
@@ -44,10 +44,10 @@ public:
 
 /** Items stored in the channel's list
  */
-typedef std::vector<ListItem> modelist;
+typedef std::list<ListItem> modelist;
 /** Max items per channel by name
  */
-typedef std::vector<ListLimit> limitlist;
+typedef std::list<ListLimit> limitlist;
 
 /** A request used to check if a user is on a channel's list or not
  */
@@ -129,7 +129,7 @@ class ListModeBase : public ModeHandler
         * specified in ListModeBase::configtag
         */
        limitlist chanlimits;
- 
+
  public:
        /** Constructor.
         * @param Instance The creator of this class
@@ -147,7 +147,7 @@ class ListModeBase : public ModeHandler
                infokey = "listbase_mode_" + std::string(1, mode) + "_list";
        }
 
-       /** See mode.h 
+       /** See mode.h
         */
        std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string &parameter)
        {
@@ -222,7 +222,7 @@ class ListModeBase : public ModeHandler
                                        mode_junk.push_back(stackresult[j]);
                                }
 
-                               ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);                
+                               ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient);
                        }
                }
        }
@@ -299,7 +299,7 @@ class ListModeBase : public ModeHandler
                                {
                                        /* Give a subclass a chance to error about this */
                                        TellAlreadyOnList(source, channel, parameter);
-                                       
+
                                        // it does, deny the change
                                        return MODEACTION_DENY;
                                }
@@ -331,7 +331,7 @@ class ListModeBase : public ModeHandler
                                                        ListItem e;
                                                        e.mask = parameter;
                                                        e.nick = servermode ? ServerInstance->Config->ServerName : source->nick;
-                                                       e.time = stringtime();
+                                                       e.time = stringtime(ServerInstance);
 
                                                        el->push_back(e);
                                                        return MODEACTION_ALLOW;
@@ -350,9 +350,9 @@ class ListModeBase : public ModeHandler
                        {
                                source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str());
                        }
-                       
+
                        parameter = "";
-                       return MODEACTION_DENY; 
+                       return MODEACTION_DENY;
                }
                else
                {
@@ -423,6 +423,8 @@ class ListModeBase : public ModeHandler
                chan->GetExt(infokey, mlist);
                irc::modestacker modestack(ServerInstance, true);
                std::deque<std::string> stackresult;
+               std::deque<TranslateType> types;
+               types.push_back(TR_TEXT);
                if (mlist)
                {
                        for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
@@ -432,9 +434,8 @@ class ListModeBase : public ModeHandler
                }
                while (modestack.GetStackedLine(stackresult))
                {
-                       irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
-                       std::string line = mode_join.GetJoined();
-                       proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, line);
+                       types.assign(stackresult.size(), this->GetTranslateType());
+                       proto->ProtoSendMode(opaque, TYPE_CHANNEL, chan, stackresult, types);
                }
        }
 
@@ -445,7 +446,7 @@ class ListModeBase : public ModeHandler
        virtual void DoCleanup(int, void*)
        {
        }
-       
+
        /** Validate parameters.
         * Overridden by implementing module.
         * @param source Source user adding the parameter
@@ -457,7 +458,7 @@ class ListModeBase : public ModeHandler
        {
                return true;
        }
-       
+
        /** Tell the user the list is too long.
         * Overridden by implementing module.
         * @param source Source user adding the parameter
@@ -469,7 +470,7 @@ class ListModeBase : public ModeHandler
        {
                return false;
        }
-       
+
        /** Tell the user an item is already on the list.
         * Overridden by implementing module.
         * @param source Source user adding the parameter
@@ -479,7 +480,7 @@ class ListModeBase : public ModeHandler
        virtual void TellAlreadyOnList(User*, Channel*, std::string&)
        {
        }
-       
+
        /** Tell the user that the parameter is not in the list.
         * Overridden by implementing module.
         * @param source Source user removing the parameter
@@ -512,33 +513,44 @@ class ListModeBase : public ModeHandler
                {
                        modelist* mlist;
                        LM->chan->GetExt(GetInfoKey(), mlist);
+
                        if (mlist)
                        {
                                if (LM->user)
+                               {
                                        LM->literal = LM->user->nick + "!" + LM->user->ident + "@" + LM->user->GetIPString();
-                               
+                               }
+
                                for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++)
                                {
                                        if (LM->extban && it->mask.length() > 1 && it->mask[0] == LM->extban && it->mask[1] == ':')
                                        {
-                                               static std::string ext = it->mask.substr(2);
+                                               std::string ext = it->mask.substr(2);
                                                if (LM->user)
                                                {
                                                        if (InspIRCd::Match(LM->user->GetFullRealHost(), ext) || InspIRCd::Match(LM->user->GetFullHost(), ext) || (InspIRCd::MatchCIDR(LM->literal, ext)))
+                                                       {
                                                                return it->mask.c_str();
+                                                       }
                                                }
                                                else if (InspIRCd::Match(LM->literal, ext))
+                                               {
                                                        return it->mask.c_str();
+                                               }
                                        }
                                        else
                                        {
                                                if (LM->user)
                                                {
                                                        if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(LM->literal, it->mask)))
+                                                       {
                                                                return it->mask.c_str();
+                                                       }
                                                }
                                                else if (InspIRCd::Match(LM->literal, it->mask))
+                                               {
                                                        return it->mask.c_str();
+                                               }
                                        }
                                }
                        }
@@ -549,4 +561,3 @@ class ListModeBase : public ModeHandler
 };
 
 #endif
-