API header and client module updates for new multi-parameter query request. Needs...

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

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index c7f99b8b2ba6751d8302ec302d330fbdfc2f3eeb..2f4f040c06f67b910cc15155b088756aa815d4eb 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -26,9 +26,9 @@ using namespace std;
 #include "helperfuncs.h"
 #include "hashcomp.h"
 
-Server *Srv;
+static Server *Srv;
         
-class TimedBan
+class TimedBan : public classbase
 {
  public:
        std::string channel;
@@ -44,10 +44,10 @@ class cmd_tban : public command_t
  public:
        cmd_tban () : command_t("TBAN", 0, 3)
        {
-               this->source = "m_timedbans.cpp";
+               this->source = "m_timedbans.so";
        }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       void Handle (const char** parameters, int pcnt, userrec *user)
        {
                chanrec* channel = Srv->FindChannel(parameters[0]);
                if (channel)
@@ -62,8 +62,8 @@ class cmd_tban : public command_t
                                }
                                for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
                                {
-                                       irc::string listitem = i->mask.c_str();
-                                       irc::string target = parameters[2];
+                                       irc::string listitem = i->mask.c_str();
+                                       irc::string target = parameters[2];
                                        irc::string listchan = i->channel.c_str();
                                        irc::string targetchan = parameters[0];
                                        if ((listitem == target) && (listchan == targetchan))
@@ -83,7 +83,7 @@ class cmd_tban : public command_t
                                char duration[MAXBUF];
                                snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1]));
                                std::string mask = parameters[2];
-                               char *setban[3];
+                               const char *setban[32];
                                setban[0] = parameters[0];
                                setban[1] = "+b";
                                setban[2] = parameters[2];
@@ -127,18 +127,18 @@ class ModuleTimedBans : public Module
                List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1;
        }
 
-       virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask)
+       virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask)
        {
-                for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
-                {
-                        irc::string listitem = banmask.c_str();
-                        irc::string target = i->mask.c_str();
-                        if (listitem == target)
-                        {
-                                TimedBanList.erase(i);
-                                break;
-                        }
-                }
+               for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+               {
+                       irc::string listitem = banmask.c_str();
+                       irc::string target = i->mask.c_str();
+                       if (listitem == target)
+                       {
+                               TimedBanList.erase(i);
+                               break;
+                       }
+               }
                return 0;
        }
 
@@ -157,10 +157,10 @@ class ModuleTimedBans : public Module
                                        if (cr)
                                        {
                                                Srv->SendChannelServerNotice(Srv->GetServerName(),cr,"NOTICE "+std::string(cr->name)+" :Timed ban on "+i->mask+" expired.");
-                                               char *setban[3];
-                                               setban[0] = (char*)i->channel.c_str();
+                                               const char *setban[3];
+                                               setban[0] = i->channel.c_str();
                                                setban[1] = "-b";
-                                               setban[2] = (char*)i->mask.c_str();
+                                               setban[2] = i->mask.c_str();
                                                // kludge alert!
                                                // ::SendMode expects a userrec* to send the numeric replies
                                                // back to, so we create it a fake user that isnt in the user
@@ -170,7 +170,7 @@ class ModuleTimedBans : public Module
                                                temp->fd = FD_MAGIC_NUMBER;
                                                temp->server = "";
                                                Srv->SendMode(setban,3,temp);
-                                               delete temp;
+                                               DELETE(temp);
                                        }
                                        // we used to delete the item here, but we dont need to as the servermode above does it for us,
                                        break;