X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_park.cpp;h=c1c8a055b77cfa1209893bde87209afcb6f55195;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=779a4e8a0eba0ac09a877e164e1e7558a8ed7919;hpb=2591562ada4cb1f866e5d1c98340fb19332b3844;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp
index 779a4e8a0..c1c8a055b 100644
--- a/src/modules/m_park.cpp
+++ b/src/modules/m_park.cpp
@@ -21,11 +21,11 @@ using namespace std;
 #include <vector>
 #include "users.h"
 #include "channels.h"
-#include "helperfuncs.h"
+
 #include "modules.h"
 #include "inspircd.h"
 
-extern InspIRCd* ServerInstance;
+
 
 /* $ModDesc: Provides support for user parking/unparking */
 
@@ -49,7 +49,7 @@ class parkedinfo : public parking
 	time_t parktime;
 };
 
-static Server *Srv;
+
 typedef std::vector<awaymsg> awaylog;
 typedef std::vector<parkedinfo> parkinfo;
 parkinfo pinfo;
@@ -61,7 +61,7 @@ parkedinfo pi;
 class cmd_park : public command_t
 {
  public:
-	cmd_park () : command_t("PARK", 0, 0)
+ cmd_park (InspIRCd* Instance) : command_t(Instance,"PARK", 0, 0)
 	{
 		this->source = "m_park.so";
 	}
@@ -106,7 +106,7 @@ class cmd_park : public command_t
 class cmd_parkstats : public command_t
 {
  public:
-	cmd_parkstats () : command_t("PARKSTATS", 'o', 0)
+ cmd_parkstats (InspIRCd* Instance) : command_t(Instance,"PARKSTATS", 'o', 0)
 	{
 		this->source = "m_park.so";
 	}
@@ -122,7 +122,7 @@ class cmd_parkstats : public command_t
 class cmd_unpark : public command_t
 {
  public:
-	cmd_unpark () : command_t("UNPARK", 0, 2)
+ cmd_unpark (InspIRCd* Instance) : command_t(Instance,"UNPARK", 0, 2)
 	{
 		this->source = "m_park.so";
 		syntax = "<nick> <key>";
@@ -146,7 +146,7 @@ class cmd_unpark : public command_t
 		 *
 		 * And there you have it, easy huh (NOT)...
 		 */
-		userrec* unpark = Srv->FindNick(std::string(parameters[0]));
+		userrec* unpark = ServerInstance->FindNick(parameters[0]);
 		if (!unpark)
 		{
 			user->WriteServ("942 %s %s :Invalid user specified.",user->nick, parameters[0]);
@@ -219,25 +219,25 @@ class ModulePark : public Module
  public:
 	virtual void ReadSettings()
 	{
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 		ParkMaxTime = Conf->ReadInteger("park","maxtime",0,true);
 		ConcurrentParks = Conf->ReadInteger("park","maxperip",0,true);
 		ParkMaxMsgs = Conf->ReadInteger("park","maxmessages",0,true);
 		DELETE(Conf);
 	}
 
-	ModulePark(Server* Me)
+	ModulePark(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		pinfo.clear();
 		this->ReadSettings();
-		cmd1 = new cmd_park();
-		cmd2 = new cmd_unpark();
-		cmd3 = new cmd_parkstats();
-		Srv->AddCommand(cmd1);
-		Srv->AddCommand(cmd2);
-		Srv->AddCommand(cmd3);
+		cmd1 = new cmd_park(ServerInstance);
+		cmd2 = new cmd_unpark(ServerInstance);
+		cmd3 = new cmd_parkstats(ServerInstance);
+		ServerInstance->AddCommand(cmd1);
+		ServerInstance->AddCommand(cmd2);
+		ServerInstance->AddCommand(cmd3);
 	}
 
 	virtual ~ModulePark()
@@ -322,13 +322,13 @@ class ModulePark : public Module
 			{
 				if (time(NULL) >= (j->parktime+ParkMaxTime))
 				{
-					userrec* thisnick = Srv->FindNick(j->nick);
+					userrec* thisnick = ServerInstance->FindNick(j->nick);
 					// THIS MUST COME BEFORE THE QuitUser - QuitUser can
 					// create a recursive call to OnUserQuit in this module
 					// and then corrupt the pointer!
 					pinfo.erase(j);
 					if (thisnick)
-						userrec::QuitUser(thisnick,"PARK timeout");
+						userrec::QuitUser(ServerInstance,thisnick,"PARK timeout");
 					go_again = true;
 					break;
 				}
@@ -374,7 +374,7 @@ class ModuleParkFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModulePark(Me);
 	}