Add 906, sasl aborted

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

diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index c6fbcdbdc0720efb217ceb3088ae298bbe374a25..1467df014cd24e581601ac74d30a11f3f02fc9ab 100644 (file)
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -51,18 +51,18 @@ static int SILENCE_ALL              = 0x0020; /* a  all, (pcint)          */
 static int SILENCE_EXCLUDE     = 0x0040; /* x  exclude this pattern  */
 
 
-class cmd_silence : public Command
+class CommandSilence : public Command
 {
        unsigned int& maxsilence;
  public:
-       cmd_silence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
+       CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
        {
                this->source = "m_silence_ext.so";
                syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, User *user)
+       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                if (!pcnt)
                {
@@ -121,7 +121,7 @@ class cmd_silence : public Command
                                                        user->WriteServ("950 %s %s :Removed %s %s from silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str());
                                                        if (!sl->size())
                                                        {
-                                                               DELETE(sl);
+                                                               delete sl;
                                                                user->Shrink("silence_list");
                                                        }
                                                        return CMD_SUCCESS;
@@ -194,6 +194,7 @@ class cmd_silence : public Command
                                        p |= SILENCE_CNOTICE;
                                        break;
                                case 'a':
+                               case '*':
                                        p |= SILENCE_ALL;
                                        break;
                                case 'x':
@@ -231,7 +232,7 @@ class cmd_silence : public Command
 
 class ModuleSilence : public Module
 {
-       cmd_silence* mycommand;
+       CommandSilence* mycommand;
        unsigned int maxsilence;
  public:
  
@@ -239,8 +240,10 @@ class ModuleSilence : public Module
                : Module(Me), maxsilence(32)
        {
                OnRehash(NULL, "");
-               mycommand = new cmd_silence(ServerInstance,maxsilence);
+               mycommand = new CommandSilence(ServerInstance,maxsilence);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnRehash, I_OnBuildExemptList, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 7);
        }
 
        virtual void OnRehash(User* user, const std::string &parameter)
@@ -251,10 +254,6 @@ class ModuleSilence : public Module
                        maxsilence = 32;
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnBuildExemptList] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = List[I_OnUserPreInvite] = 1;
-       }
 
        virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
        {
@@ -263,7 +262,7 @@ class ModuleSilence : public Module
                user->GetExt("silence_list", sl);
                if (sl)
                {
-                       DELETE(sl);
+                       delete sl;
                        user->Shrink("silence_list");
                }
        }
@@ -336,7 +335,7 @@ class ModuleSilence : public Module
                return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_NOTICE);
        }
 
-       virtual int OnUserPreInvite(User* source,User* dest,Channel* channel)
+       virtual int OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout)
        {
                return MatchPattern(dest, source, SILENCE_INVITE);
        }