m_namesx Handle colons in channel names properly

[user/henk/code/inspircd.git] / src / modules / m_autoop.cpp

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index 3448bf9f5b58013a0ff69d4a60424a32548902ec..40a57d7c3cf7024c2ffd53ba4d508f573716601f 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2011 Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
@@ -81,33 +88,39 @@ public:
                ServerInstance->Modules->AddService(mh);
                mh.DoImplements(this);
 
-               Implementation list[] = { I_OnUserPreJoin, };
+               Implementation list[] = { I_OnPostJoin, };
                ServerInstance->Modules->Attach(list, this, 1);
        }
 
-       ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
+       void OnPostJoin(Membership *memb)
        {
-               if (!chan)
-                       return MOD_RES_PASSTHRU;
+               if (!IS_LOCAL(memb->user))
+                       return;
 
-               modelist* list = mh.extItem.get(chan);
+               modelist* list = mh.extItem.get(memb->chan);
                if (list)
                {
+                       std::string modeline("+");
+                       std::vector<std::string> modechange;
+                       modechange.push_back(memb->chan->name);
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
                                std::string::size_type colon = it->mask.find(':');
                                if (colon == std::string::npos)
                                        continue;
-                               if (chan->CheckBan(user, it->mask.substr(colon+1)))
+                               if (memb->chan->CheckBan(memb->user, it->mask.substr(colon+1)))
                                {
                                        ModeHandler* given = mh.FindMode(it->mask.substr(0, colon));
-                                       if (given)
-                                               privs += given->GetModeChar();
+                                       if (given && given->GetPrefixRank())
+                                               modeline.push_back(given->GetModeChar());
                                }
                        }
+                       modechange.push_back(modeline);
+                       for(std::string::size_type i = modeline.length(); i > 1; --i) // we use "i > 1" instead of "i" so we skip the +
+                               modechange.push_back(memb->user->nick);
+                       if(modechange.size() >= 3)
+                               ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
                }
-
-               return MOD_RES_PASSTHRU;
        }
 
        void OnCleanup(int target_type, void* item)