X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=8e6b2c50ca5d003ad4420142da70694fdfcebffd;hb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;hp=1e11dfd510454ef7bda8fab4f35b24e37d8d0106;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 1e11dfd51..8e6b2c50c 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -24,19 +24,21 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for the /watch command */
 
 static Server *Srv;
+extern InspIRCd* ServerInstance;
 
-class watchentry
+class watchentry : public classbase
 {
  public:
 	userrec* watcher;
 	std::string target;
 };
 
-typedef std::vector<watchentry> watchlist;
+typedef std::vector<watchentry*> watchlist;
 watchlist watches;
 
 class cmd_watch : public command_t
@@ -45,30 +47,32 @@ class cmd_watch : public command_t
 	cmd_watch() : command_t("WATCH",0,0)
 	{
 		this->source = "m_watch.so";
+		syntax = "[C|L|S]|[+|-<nick>]";
 	}
 
-	void Handle (char **parameters, int pcnt, userrec *user)
+	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		if (!pcnt)
 		{
 			for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 			{
-				if (q->watcher == user)
+				watchentry* a = (watchentry*)(*q);
+				if (a->watcher == user)
 				{
-					userrec* targ = Srv->FindNick(q->target);
+					userrec* targ = ServerInstance->FindNick(a->target);
 					if (targ)
 					{
-						WriteServ(user->fd,"604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age);
+						user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age);
 					}
 				}
 			}
-			WriteServ(user->fd,"607 %s :End of WATCH list",user->nick);
+			user->WriteServ("607 %s :End of WATCH list",user->nick);
 		}
 		else if (pcnt > 0)
 		{
 			for (int x = 0; x < pcnt; x++)
 			{
-				char *nick = parameters[x];
+				const char *nick = parameters[x];
 				if (!strcasecmp(nick,"C"))
 				{
 					// watch clear
@@ -78,10 +82,12 @@ class cmd_watch : public command_t
 						done = true;
 						for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 						{
-							if (q->watcher == user)
+							watchentry* a = (watchentry*)(*q);
+							if (a->watcher == user)
 							{
 								done = false;
 								watches.erase(q);
+								delete a;
 								break;
 							}
 						}
@@ -91,32 +97,34 @@ class cmd_watch : public command_t
 				{
 					for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 					{
-						if (q->watcher == user)
+						watchentry* a = (watchentry*)(*q);
+						if (a->watcher == user)
 						{
-							userrec* targ = Srv->FindNick(q->target);
+							userrec* targ = ServerInstance->FindNick(a->target);
 							if (targ)
 							{
-								WriteServ(user->fd,"604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age);
+								user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age);
 							}
 						}
 					}
-					WriteServ(user->fd,"607 %s :End of WATCH list",user->nick);
+					user->WriteServ("607 %s :End of WATCH list",user->nick);
 				}
 				else if (!strcasecmp(nick,"S"))
 				{
 					std::string list = "";
 					for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 					{
-						if (q->watcher == user)
+						watchentry* a = (watchentry*)(*q);
+						if (a->watcher == user)
 						{
-							list = list + " " + q->target;
+							list.append(" ").append(a->target);
 						}
 					}
 					char* l = (char*)list.c_str();
 					if (*l == ' ')
 						l++;
-					WriteServ(user->fd,"606 %s :%s",user->nick,l);
-					WriteServ(user->fd,"607 %s :End of WATCH S",user->nick);
+					user->WriteServ("606 %s :%s",user->nick,l);
+					user->WriteServ("607 %s :End of WATCH S",user->nick);
 				}
 				else if (nick[0] == '-')
 				{
@@ -125,21 +133,23 @@ class cmd_watch : public command_t
 					irc::string n1 = nick;
 					for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 					{
-						if (q->watcher == user)
+						watchentry* b = (watchentry*)(*q);
+						if (b->watcher == user)
 						{
-							irc::string n2 = q->target.c_str();
-							userrec* a = Srv->FindNick(q->target);
+							irc::string n2 = b->target.c_str();
+							userrec* a = ServerInstance->FindNick(b->target);
 							if (a)
 							{
-								WriteServ(user->fd,"602 %s %s %s %s %lu :stopped watching",user->nick,a->nick,a->ident,a->dhost,a->age);
+								user->WriteServ("602 %s %s %s %s %lu :stopped watching",user->nick,a->nick,a->ident,a->dhost,a->age);
 							}
 							else
 							{
-								 WriteServ(user->fd,"602 %s %s * * 0 :stopped watching",user->nick,q->target.c_str());
+								 user->WriteServ("602 %s %s * * 0 :stopped watching",user->nick,b->target.c_str());
 							}
 							if (n1 == n2)
 							{
 								watches.erase(q);
+								delete b;
 								break;
 							}
 						}
@@ -152,9 +162,10 @@ class cmd_watch : public command_t
 					bool exists = false;
 					for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 					{
-						if (q->watcher == user)
+						watchentry* a = (watchentry*)(*q);
+						if (a->watcher == user)
 						{
-							irc::string n2 = q->target.c_str();
+							irc::string n2 = a->target.c_str();
 							if (n1 == n2)
 							{
 								// already on watch list
@@ -164,20 +175,20 @@ class cmd_watch : public command_t
 					}
 					if (!exists)
 					{
-						watchentry w;
-						w.watcher = user;
-						w.target = nick;
+						watchentry* w = new watchentry();
+						w->watcher = user;
+						w->target = nick;
 						watches.push_back(w);
 						log(DEBUG,"*** Added %s to watchlist of %s",nick,user->nick);
 					}
-		       			userrec* a = Srv->FindNick(nick);
+		       			userrec* a = ServerInstance->FindNick(nick);
 		       			if (a)
 		       			{
-		       				WriteServ(user->fd,"604 %s %s %s %s %lu :is online",user->nick,a->nick,a->ident,a->dhost,a->age);
+		       				user->WriteServ("604 %s %s %s %s %lu :is online",user->nick,a->nick,a->ident,a->dhost,a->age);
 					}
 					else
 					{
-						WriteServ(user->fd,"605 %s %s * * 0 :is offline",user->nick,nick);
+						user->WriteServ("605 %s %s * * 0 :is offline",user->nick,nick);
 					}
 				}
 			}
@@ -210,11 +221,12 @@ class Modulewatch : public Module
 		irc::string n2 = user->nick;
 		for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 		{
-			irc::string n1 = q->target.c_str();
+			watchentry* a = (watchentry*)(*q);
+			irc::string n1 = a->target.c_str();
 			if (n1 == n2)
 			{
-				log(DEBUG,"*** WATCH: On global quit: user %s is in notify of %s",user->nick,q->watcher->nick);
-				WriteServ(q->watcher->fd,"601 %s %s %s %s %lu :went offline",q->watcher->nick,user->nick,user->ident,user->dhost,time(NULL));
+				log(DEBUG,"*** WATCH: On global quit: user %s is in notify of %s",user->nick,a->watcher->nick);
+				a->watcher->WriteServ("601 %s %s %s %s %lu :went offline",a->watcher->nick,user->nick,user->ident,user->dhost,time(NULL));
 			}
 		}
 		bool done = false;
@@ -223,10 +235,12 @@ class Modulewatch : public Module
 			done = true;
 			for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 			{
-				if (q->watcher == user)
+				watchentry* a = (watchentry*)(*q);
+				if (a->watcher == user)
 				{
 					done = false;
 					watches.erase(q);
+					delete a;
 					break;
 				}
 			}
@@ -239,11 +253,12 @@ class Modulewatch : public Module
 		log(DEBUG,"*** WATCH: On global connect: user %s",user->nick);
 		for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 		{
-			irc::string n1 = q->target.c_str();
+			watchentry* a = (watchentry*)(*q);
+			irc::string n1 = a->target.c_str();
 			if (n1 == n2)
 			{
-				log(DEBUG,"*** WATCH: On global connect: user %s is in notify of %s",user->nick,q->watcher->nick);
-				WriteServ(q->watcher->fd,"600 %s %s %s %s %lu :arrived online",q->watcher->nick,user->nick,user->ident,user->dhost,user->age);
+				log(DEBUG,"*** WATCH: On global connect: user %s is in notify of %s",user->nick,a->watcher->nick);
+				a->watcher->WriteServ("600 %s %s %s %s %lu :arrived online",a->watcher->nick,user->nick,user->ident,user->dhost,user->age);
 			}
 		}
 	}
@@ -255,18 +270,19 @@ class Modulewatch : public Module
 		log(DEBUG,"*** WATCH: On global nickchange: old nick: %s new nick: %s",oldnick.c_str(),user->nick);
 		for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
 		{
-			irc::string n1 = q->target.c_str();
+			watchentry* a = (watchentry*)(*q);
+			irc::string n1 = a->target.c_str();
 			// changed from a nick on the watchlist to one that isnt
 			if (n1 == n2)
 			{
-				log(DEBUG,"*** WATCH: On global nickchange: old nick %s was on notify list of %s",oldnick.c_str(),q->watcher->nick);
-				WriteServ(q->watcher->fd,"601 %s %s %s %s %lu :went offline",q->watcher->nick,oldnick.c_str(),user->ident,user->dhost,time(NULL));
+				log(DEBUG,"*** WATCH: On global nickchange: old nick %s was on notify list of %s",oldnick.c_str(),a->watcher->nick);
+				a->watcher->WriteServ("601 %s %s %s %s %lu :went offline",a->watcher->nick,oldnick.c_str(),user->ident,user->dhost,time(NULL));
 			}
 			else if (n1 == n3)
 			{
 				// changed from a nick not on notify to one that is
-				log(DEBUG,"*** WATCH: On global nickchange: new nick %s is on notify list of %s",user->nick,q->watcher->nick);
-				WriteServ(q->watcher->fd,"600 %s %s %s %s %lu :arrived online",q->watcher->nick,user->nick,user->ident,user->dhost,user->age);
+				log(DEBUG,"*** WATCH: On global nickchange: new nick %s is on notify list of %s",user->nick,a->watcher->nick);
+				a->watcher->WriteServ("600 %s %s %s %s %lu :arrived online",a->watcher->nick,user->nick,user->ident,user->dhost,user->age);
 			}
 		}
 	}