X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_autoop.cpp;h=0c0e8f579a1e458094b758557332904db4c4d9b3;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=3448bf9f5b58013a0ff69d4a60424a32548902ec;hpb=095e0a067b6ed1a191c31711771df66acfc41f2c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index 3448bf9f5..0c0e8f579 100644
--- 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"
 
@@ -31,7 +38,7 @@ class AutoOpList : public ListModeBase
 	{
 		if (mid.length() == 1)
 			return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
-		for(char c='A'; c < 'z'; c++)
+		for(char c='A'; c <= 'z'; c++)
 		{
 			ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
 			if (mh && mh->name == mid)
@@ -77,42 +84,47 @@ class ModuleAutoOp : public Module
 
 public:
 	ModuleAutoOp() : mh(this)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->Modules->AddService(mh);
 		mh.DoImplements(this);
 
-		Implementation list[] = { I_OnUserPreJoin, };
-		ServerInstance->Modules->Attach(list, this, 1);
+		Implementation list[] = { I_OnPostJoin, };
+		ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
 	}
 
-	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)
-	{
-		mh.DoCleanup(target_type, item);
 	}
 
 	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)