X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_watch.cpp;h=ec38edc31b8727b55e922234bc31078af72a64d8;hb=47332d6e9b990498dd35457090dd8983d8aae8d3;hp=6aa12b4e7197fc1d8f2248eacc64fae5f5b14b07;hpb=c05ad37bfd03486475889485606ed5cffc7bf5a2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 6aa12b4e7..ec38edc31 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -249,7 +249,7 @@ class CommandWatch : public Command
 			}
 			else
 			{
-				(*wl)[nick] = "";
+				(*wl)[nick].clear();
 				user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick.c_str(), nick);
 			}
 		}
@@ -377,21 +377,24 @@ class Modulewatch : public Module
 
  public:
 	Modulewatch()
-		: maxwatch(32), cmdw(this, maxwatch), sw(this) 
+		: maxwatch(32), cmdw(this, maxwatch), sw(this)
 	{
-		OnRehash(NULL);
 		whos_watching_me = new watchentries();
-		ServerInstance->AddCommand(&cmdw);
-		ServerInstance->AddCommand(&sw);
-		ServerInstance->Extensions.Register(&cmdw.ext);
+	}
+
+	void init()
+	{
+		OnRehash(NULL);
+		ServerInstance->Modules->AddService(cmdw);
+		ServerInstance->Modules->AddService(sw);
+		ServerInstance->Modules->AddService(cmdw.ext);
 		Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway };
-		ServerInstance->Modules->Attach(eventlist, this, 7);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-		maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
+		maxwatch = ServerInstance->Config->ConfValue("watch")->getInt("maxentries", 32);
 		if (!maxwatch)
 			maxwatch = 32;
 	}
@@ -436,7 +439,7 @@ class Modulewatch : public Module
 				watchlist* wl = cmdw.ext.get(*n);
 				if (wl)
 					/* We were on somebody's notify list, set ourselves offline */
-					(*wl)[user->nick.c_str()] = "";
+					(*wl)[user->nick.c_str()].clear();
 			}
 		}
 
@@ -505,7 +508,7 @@ class Modulewatch : public Module
 				if (wl)
 				{
 					(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str(), oldnick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
-					(*wl)[oldnick.c_str()] = "";
+					(*wl)[oldnick.c_str()].clear();
 				}
 			}
 		}