X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_autoop.cpp;h=0c0e8f579a1e458094b758557332904db4c4d9b3;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=b96495bf73ad7bdc28635cb4fd49f902eccc1d3c;hpb=87ad22b6067534329f76acc45fdad8e09688db65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index b96495bf7..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"
 
@@ -24,6 +31,20 @@ class AutoOpList : public ListModeBase
 	AutoOpList(Module* Creator) : ListModeBase(Creator, "autoop", 'w', "End of Channel Access List", 910, 911, true)
 	{
 		levelrequired = OP_VALUE;
+		tidy = false;
+	}
+
+	ModeHandler* FindMode(const std::string& mid)
+	{
+		if (mid.length() == 1)
+			return ServerInstance->Modes->FindMode(mid[0], MODETYPE_CHANNEL);
+		for(char c='A'; c <= 'z'; c++)
+		{
+			ModeHandler* mh = ServerInstance->Modes->FindMode(c, MODETYPE_CHANNEL);
+			if (mh && mh->name == mid)
+				return mh;
+		}
+		return NULL;
 	}
 
 	ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -32,72 +53,78 @@ class AutoOpList : public ListModeBase
 		if (pos == 0 || pos == std::string::npos)
 			return adding ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 		unsigned int mylevel = channel->GetPrefixValue(source);
-		while (pos > 0)
+		std::string mid = parameter.substr(0, pos);
+		ModeHandler* mh = FindMode(mid);
+
+		if (adding && (!mh || !mh->GetPrefixRank()))
 		{
-			pos--;
-			ModeHandler* mh = ServerInstance->Modes->FindMode(parameter[pos], MODETYPE_CHANNEL);
-			if (adding && (!mh || !mh->GetPrefixRank()))
-			{
-				source->WriteNumeric(415, "%s %c :Cannot find prefix mode '%c' for autoop",
-					source->nick.c_str(), parameter[pos], parameter[pos]);
-				return MOD_RES_DENY;
-			}
-			else if (!mh)
-				continue;
+			source->WriteNumeric(415, "%s %s :Cannot find prefix mode '%s' for autoop",
+				source->nick.c_str(), mid.c_str(), mid.c_str());
+			return MOD_RES_DENY;
+		}
+		else if (!mh)
+			return MOD_RES_PASSTHRU;
 
-			std::string dummy;
-			if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
-				return MOD_RES_DENY;
-			if (mh->GetLevelRequired() > mylevel)
-			{
-				source->WriteNumeric(482, "%s %s :You must be able to set mode '%c' to include it in an autoop",
-					source->nick.c_str(), channel->name.c_str(), parameter[pos]);
-				return MOD_RES_DENY;
-			}
+		std::string dummy;
+		if (mh->AccessCheck(source, channel, dummy, true) == MOD_RES_DENY)
+			return MOD_RES_DENY;
+		if (mh->GetLevelRequired() > mylevel)
+		{
+			source->WriteNumeric(482, "%s %s :You must be able to set mode '%s' to include it in an autoop",
+				source->nick.c_str(), channel->name.c_str(), mid.c_str());
+			return MOD_RES_DENY;
 		}
 		return MOD_RES_PASSTHRU;
 	}
 };
 
-
 class ModuleAutoOp : public Module
 {
 	AutoOpList mh;
 
 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)))
-					privs += it->mask.substr(0, colon);
+				if (memb->chan->CheckBan(memb->user, it->mask.substr(colon+1)))
+				{
+					ModeHandler* given = mh.FindMode(it->mask.substr(0, colon));
+					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)