X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.h;h=23cf8cf69a748ef9a373340c1f3e5745b5340e2f;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=9ce7f95012c602a2bb6e51cba14d9661dd186172;hpb=0023d21ce23812ad59aefc0b62aac37bd09d182e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index 9ce7f9501..23cf8cf69 100644
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -21,6 +21,8 @@
 #ifndef M_CAP_H
 #define M_CAP_H
 
+class GenericCap;
+
 class CapEvent : public Event
 {
  public:
@@ -35,6 +37,7 @@ class CapEvent : public Event
 	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;
 	CapEvent(Module* sender, User* u, CapEventType capevtype) : Event(sender, "cap_request"), type(capevtype), user(u) {}
 };
@@ -46,7 +49,7 @@ class GenericCap
 	const std::string cap;
 	GenericCap(Module* parent, const std::string &Cap) : ext("cap_" + Cap, parent), cap(Cap)
 	{
-		ServerInstance->Extensions.Register(&ext);
+		ServerInstance->Modules->AddService(ext);
 	}
 
 	void HandleEvent(Event& ev)
@@ -57,13 +60,19 @@ class GenericCap
 		CapEvent *data = static_cast<CapEvent*>(&ev);
 		if (data->type == CapEvent::CAPEVENT_REQ)
 		{
-			std::vector<std::string>::iterator it;
-			if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end())
+			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;
+				}
 			}
 		}
 		else if (data->type == CapEvent::CAPEVENT_LS)