Add initial query support to m_mysql [patch by Athenon]

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

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index d9d55f14b2f0cff24cff262676af21b594242863..dd720608fdf573ed2733e1f71c2034f1032eb827 100644 (file)
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -53,9 +53,8 @@ static int SILENCE_EXCLUDE    = 0x0040; /* x  exclude this pattern  */
 class CommandSVSSilence : public Command
 {
  public:
-       CommandSVSSilence(InspIRCd* Instance) : Command(Instance,"SVSSILENCE", 0, 2)
+       CommandSVSSilence(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SVSSILENCE", 0, 2)
        {
-               this->source = "m_silence.so";
                syntax = "<target> {[+|-]<mask> <p|c|i|n|t|a|x>}";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
        }
@@ -89,9 +88,8 @@ class CommandSilence : public Command
 {
        unsigned int& maxsilence;
  public:
-       CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max)
+       CommandSilence (InspIRCd* Instance, Module* Creator, unsigned int &max) : Command(Instance, Creator, "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);
        }
@@ -266,25 +264,23 @@ class CommandSilence : public Command
 
 class ModuleSilence : public Module
 {
-       CommandSilence* cmdsilence;
-       CommandSVSSilence *cmdsvssilence;
        unsigned int maxsilence;
+       CommandSilence cmdsilence;
+       CommandSVSSilence cmdsvssilence;
  public:
 
        ModuleSilence(InspIRCd* Me)
-               : Module(Me), maxsilence(32)
+               : Module(Me), maxsilence(32), cmdsilence(Me, this, maxsilence), cmdsvssilence(Me, this)
        {
-               OnRehash(NULL, "");
-               cmdsilence = new CommandSilence(ServerInstance,maxsilence);
-               cmdsvssilence = new CommandSVSSilence(ServerInstance);
-               ServerInstance->AddCommand(cmdsilence);
-               ServerInstance->AddCommand(cmdsvssilence);
+               OnRehash(NULL);
+               ServerInstance->AddCommand(&cmdsilence);
+               ServerInstance->AddCommand(&cmdsvssilence);
 
                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)
+       virtual void OnRehash(User* user)
        {
                ConfigReader Conf(ServerInstance);
                maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true);
@@ -335,7 +331,7 @@ class ModuleSilence : public Module
                {
                        if (IS_LOCAL(i->first))
                        {
-                               if (MatchPattern(i->first, sender, public_silence) == 1)
+                               if (MatchPattern(i->first, sender, public_silence) == MOD_RES_ALLOW)
                                {
                                        exempt_list[i->first] = i->first->nick;
                                }
@@ -343,7 +339,7 @@ class ModuleSilence : public Module
                }
        }
 
-       virtual int PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
+       virtual ModResult PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type)
        {
                if (target_type == TYPE_USER && IS_LOCAL(((User*)dest)))
                {
@@ -357,29 +353,29 @@ class ModuleSilence : public Module
                                this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list, "");
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_PRIVATE);
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_NOTICE);
        }
 
-       virtual int OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout)
+       virtual ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout)
        {
                return MatchPattern(dest, source, SILENCE_INVITE);
        }
 
-       int MatchPattern(User* dest, User* source, int pattern)
+       ModResult MatchPattern(User* dest, User* source, int pattern)
        {
                /* Server source */
                if (!source || !dest)
-                       return 1;
+                       return MOD_RES_ALLOW;
 
                silencelist* sl;
                dest->GetExt("silence_list", sl);
@@ -388,10 +384,10 @@ class ModuleSilence : public Module
                        for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++)
                        {
                                if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (InspIRCd::Match(source->GetFullHost(), c->first)))
-                                       return !(((c->second & SILENCE_EXCLUDE) > 0));
+                                       return (c->second & SILENCE_EXCLUDE) ? MOD_RES_PASSTHRU : MOD_RES_DENY;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleSilence()