X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=ca51fc690b90a343d1e3c2ae2775c39d147dd4b8;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=1705857379c98a8fe2dcb07803e338db631da0cc;hpb=fbb32452c3f4c2ea14ba1ba647369c6f508d916f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 170585737..ca51fc690 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -11,11 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the /WATCH command */
 
@@ -61,8 +61,16 @@
  * of users using WATCH.
  */
 
-typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> >     watchentries;
-typedef std::map<irc::string, std::string>                                                  watchlist;
+/*
+ * Before you start screaming, this definition is only used here, so moving it to a header is pointless.
+ * Yes, it's horrid. Blame cl for being different. -- w00t
+ */
+#ifdef WINDOWS
+typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash_compare<irc::string, less<irc::string> > > watchentries;
+#else
+typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
+#endif
+typedef std::map<irc::string, std::string>watchlist;
 
 /* Who's watching each nickname.
  * NOTE: We do NOT iterate this to display a user's WATCH list!
@@ -301,16 +309,25 @@ class Modulewatch : public Module
  public:
 
 	Modulewatch(InspIRCd* Me)
-		: Module::Module(Me), maxwatch(32)
+		: Module(Me), maxwatch(32)
 	{
+		OnRehash(NULL, "");
 		whos_watching_me = new watchentries();
 		mycommand = new cmd_watch(ServerInstance, maxwatch);
 		ServerInstance->AddCommand(mycommand);
 	}
 
+	virtual void OnRehash(userrec* user, const std::string &parameter)
+	{
+		ConfigReader Conf(ServerInstance);
+		maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
+		if (!maxwatch)
+			maxwatch = 32;
+	}
+
 	void Implements(char* List)
 	{
-		List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
+		List[I_OnRehash] = List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
 	}
 
 	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
@@ -359,15 +376,15 @@ class Modulewatch : public Module
 	virtual void OnGarbageCollect()
 	{
 		watchentries* old_watch = whos_watching_me;
-	        whos_watching_me = new watchentries();
+		whos_watching_me = new watchentries();
 
 		for (watchentries::const_iterator n = old_watch->begin(); n != old_watch->end(); n++)
 			whos_watching_me->insert(*n);
 
-	        delete old_watch;
+		delete old_watch;
 	}
 
-        virtual void OnCleanup(int target_type, void* item)
+	virtual void OnCleanup(int target_type, void* item)
 	{
 		if (target_type == TYPE_USER)
 		{
@@ -428,7 +445,7 @@ class Modulewatch : public Module
 				{
 					if (!user->Visibility || user->Visibility->VisibleTo(user))
 	 					(*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age);
-					(*wl)[user->nick] = "";
+					(*wl)[oldnick.c_str()] = "";
 				}
 			}
 		}
@@ -437,7 +454,7 @@ class Modulewatch : public Module
 	virtual void On005Numeric(std::string &output)
 	{
 		// we don't really have a limit...
-		output = output + " WATCH=32";
+		output = output + " WATCH=" + ConvToStr(maxwatch);
 	}
 	
 	virtual ~Modulewatch()
@@ -471,7 +488,7 @@ class ModulewatchFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModulewatchFactory;
 }