Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

[user/henk/code/inspircd.git] / src / modules / m_park.cpp

diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp
index f6e2b69ac322edcde852620e703885fb5dea13f1..de8eeb25e57e1d58484c6ce5d4ebc18b1a35548a 100644 (file)
--- 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,12 +61,12 @@ 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";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                /** Parking. easy stuff.
                 *
@@ -82,6 +82,7 @@ class cmd_park : public command_t
                if (othersessions >= ConcurrentParks)
                {
                        user->WriteServ("927 "+std::string(user->nick)+" :You are already parked up to the maximum number of allowed times.");
+                       return CMD_FAILURE;
                }
                else
                {
@@ -98,6 +99,7 @@ class cmd_park : public command_t
                        pi.host = user->host;
                        pi.parktime = time(NULL);
                        pinfo.push_back(pi);
+                       return CMD_SUCCESS;
                }
        }
 
@@ -106,29 +108,30 @@ 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";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                char status[MAXBUF];
                snprintf(status,MAXBUF,"NOTICE %s :There are a total of %lu parked clients on this server, with a maximum of %lu parked sessions allowed per user.",user->nick,(unsigned long)pinfo.size(),(unsigned long)ConcurrentParks);
                user->WriteServ(std::string(status));
+               return CMD_SUCCESS;
        }
 };
 
 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>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                /** Unparking. complicated stuff.
                 *
@@ -150,7 +153,7 @@ class cmd_unpark : public command_t
                if (!unpark)
                {
                        user->WriteServ("942 %s %s :Invalid user specified.",user->nick, parameters[0]);
-                       return;
+                       return CMD_FAILURE;
                }
                awaylog* awy;
                unpark->GetExt("park_awaylog", awy);
@@ -159,7 +162,7 @@ class cmd_unpark : public command_t
                if (!awy)
                {
                        user->WriteServ("943 %s %s :This user is not parked.",user->nick, unpark->nick);
-                       return;
+                       return CMD_FAILURE;
                }
                if (*key == atoi(parameters[1]))
                {
@@ -205,7 +208,10 @@ class cmd_unpark : public command_t
                else
                {
                        user->WriteServ("928 "+std::string(user->nick)+" :Incorrect park key.");
+                       return CMD_FAILURE;
                }
+
+               return CMD_SUCCESS;
        }
 };
 
@@ -219,7 +225,7 @@ 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);
@@ -232,12 +238,12 @@ class ModulePark : public Module
                
                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()