Update copyrights for 2009.

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

diff --git a/include/u_listmode.h b/include/u_listmode.h
index b81cfbb84c550c9f96b9bd2ae39cd79e29a3b3da..97a6243e57ccba8b9ee1e8ffa44b351ca1e15a5f 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
  */
@@ -79,7 +79,7 @@ class ListModeRequest : public Request
         * @param literalstr String to check against, e.g. "Bob!Bobbertson@weeblshouse"
         * @param extbanchar Extended ban character to use for the match, or a null char if not using extban
         */
-       ListModeRequest(Module* sender, Module* target, std::string literalstr, char extbanchar, Channel* channel) : Request(sender, target, "LM_CHECKLIST_EX"), literal(literalstr), extban(extbanchar), chan(channel)
+       ListModeRequest(Module* sender, Module* target, std::string literalstr, char extbanchar, Channel* channel) : Request(sender, target, "LM_CHECKLIST_EX"), user(NULL), literal(literalstr), extban(extbanchar), chan(channel)
        {
        }
 
@@ -178,7 +178,7 @@ class ListModeBase : public ModeHandler
                {
                        for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
                        {
-                               user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+                               user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), (it->nick.length() ? it->nick.c_str() : ServerInstance->Config->ServerName), it->time.c_str());
                        }
                }
                user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
@@ -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;
@@ -521,12 +521,23 @@ class ListModeBase : public ModeHandler
                                {
                                        if (LM->extban && it->mask.length() > 1 && it->mask[0] == LM->extban && it->mask[1] == ':')
                                        {
-                                               if (InspIRCd::Match(LM->literal.substr(2), it->mask))
+                                               static 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 (InspIRCd::Match(LM->literal, it->mask))
+                                               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();
                                        }
                                }