X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.h;h=23cf8cf69a748ef9a373340c1f3e5745b5340e2f;hb=692865acd58c9a475db1fdf4d419188325cd2182;hp=a375801264218bf345543b95c8fa1979d5ff77ff;hpb=91df762e93212958db487d8517addba1a63a4ddd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index a37580126..23cf8cf69 100644
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -1,30 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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/>.
  */
 
-#ifndef __CAP_H__
-#define __CAP_H__
 
-#include <map>
-#include <string>
+#ifndef M_CAP_H
+#define M_CAP_H
+
+class GenericCap;
 
-class CapData : public classbase
+class CapEvent : public Event
 {
  public:
-	irc::string type;
+	enum CapEventType
+	{
+		CAPEVENT_REQ,
+		CAPEVENT_LS,
+		CAPEVENT_LIST,
+		CAPEVENT_CLEAR
+	};
+
+	CapEventType type;
 	std::vector<std::string> wanted;
 	std::vector<std::string> ack;
+	std::vector<std::pair<GenericCap*, int> > changed; // HACK: clean this up before 2.2
 	User* user;
-	Module* creator;
+	CapEvent(Module* sender, User* u, CapEventType capevtype) : Event(sender, "cap_request"), type(capevtype), user(u) {}
 };
 
 class GenericCap
@@ -34,42 +49,43 @@ class GenericCap
 	const std::string cap;
 	GenericCap(Module* parent, const std::string &Cap) : ext("cap_" + Cap, parent), cap(Cap)
 	{
-		Extensible::Register(&ext);
+		ServerInstance->Modules->AddService(ext);
 	}
 
-	void HandleEvent(Event* ev)
+	void HandleEvent(Event& ev)
 	{
-		if (ev->GetEventID() == "cap_req")
-		{
-			CapData *data = (CapData *) ev->GetData();
+		if (ev.id != "cap_request")
+			return;
 
-			std::vector<std::string>::iterator it;
-			if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end())
+		CapEvent *data = static_cast<CapEvent*>(&ev);
+		if (data->type == CapEvent::CAPEVENT_REQ)
+		{
+			for (std::vector<std::string>::iterator it = data->wanted.begin(); it != data->wanted.end(); ++it)
 			{
-				// we can handle this, so ACK it, and remove it from the wanted list
-				data->ack.push_back(*it);
-				data->wanted.erase(it);
-				ext.set(data->user, 1);
+				if (it->empty())
+					continue;
+				bool enablecap = ((*it)[0] != '-');
+				if (((enablecap) && (*it == cap)) || (*it == "-" + cap))
+				{
+					// we can handle this, so ACK it, and remove it from the wanted list
+					data->ack.push_back(*it);
+					data->wanted.erase(it);
+					data->changed.push_back(std::make_pair(this, ext.set(data->user, enablecap ? 1 : 0)));
+					break;
+				}
 			}
 		}
-
-		if (ev->GetEventID() == "cap_ls")
+		else if (data->type == CapEvent::CAPEVENT_LS)
 		{
-			CapData *data = (CapData *) ev->GetData();
 			data->wanted.push_back(cap);
 		}
-
-		if (ev->GetEventID() == "cap_list")
+		else if (data->type == CapEvent::CAPEVENT_LIST)
 		{
-			CapData *data = (CapData *) ev->GetData();
-
 			if (ext.get(data->user))
 				data->wanted.push_back(cap);
 		}
-
-		if (ev->GetEventID() == "cap_clear")
+		else if (data->type == CapEvent::CAPEVENT_CLEAR)
 		{
-			CapData *data = (CapData *) ev->GetData();
 			data->ack.push_back("-" + cap);
 			ext.set(data->user, 0);
 		}