Merge pull request #443 from ShutterQuick/sasl_external

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 7c80aa6577ffa1a97b869ca89c22dbf2fb33dbf9..7f843f25253e15dee448d4f3ac412ef93defa380 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -22,7 +22,7 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
+/* $ModDesc: Implementation of callerid, usermode +g, /accept */
 
 class callerid_data
 {
@@ -54,11 +54,8 @@ class callerid_data
                        }
 
                        User *u = ServerInstance->FindNick(tok);
-                       if (!u)
-                       {
-                               continue;
-                       }
-                       accepting.insert(u);
+                       if ((u) && (u->registered == REG_ALL) && (!u->quitting) && (!IS_SERVER(u)))
+                               accepting.insert(u);
                }
        }
 
@@ -122,6 +119,7 @@ struct CallerIDExtInfo : public ExtensionItem
                        if (it2 != targ->wholistsme.end())
                                targ->wholistsme.erase(it2);
                }
+               delete dat;
        }
 };
 
@@ -139,6 +137,7 @@ public:
        CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1),
                extInfo(Creator)
        {
+               allow_empty_last_param = false;
                syntax = "{[+|-]<nicks>}|*}";
                TRANSLATE2(TR_CUSTOM, TR_END);
        }
@@ -147,7 +146,7 @@ public:
        {
                if (index != 0)
                        return;
-               std::string out = "";
+               std::string out;
                irc::commasepstream nicks(parameter);
                std::string tok;
                while (nicks.GetToken(tok))
@@ -165,18 +164,12 @@ public:
                                tok.erase(0, 1); // Remove the dash.
                        }
                        User* u = ServerInstance->FindNick(tok);
-                       if (u)
-                       {
-                               if (dash)
-                                       out.append("-");
-                               out.append(u->uuid);
-                       }
-                       else
-                       {
-                               if (dash)
-                                       out.append("-");
-                               out.append(tok);
-                       }
+                       if ((!u) || (u->registered != REG_ALL) || (u->quitting) || (IS_SERVER(u)))
+                               continue;
+
+                       if (dash)
+                               out.append("-");
+                       out.append(u->uuid);
                }
                parameter = out;
        }
@@ -212,7 +205,7 @@ public:
                else
                {
                        User* whotoadd = ServerInstance->FindNick(tok[0] == '+' ? tok.substr(1) : tok);
-                       if (whotoadd)
+                       if ((whotoadd) && (whotoadd->registered == REG_ALL) && (!whotoadd->quitting) && (!IS_SERVER(whotoadd)))
                                return (AddAccept(user, whotoadd) ? CMD_SUCCESS : CMD_FAILURE);
                        else
                        {
@@ -346,8 +339,8 @@ public:
                ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(cmd.extInfo);
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleCallerID()
@@ -356,7 +349,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR);
+               return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
        }
 
        virtual void On005Numeric(std::string& output)
@@ -408,11 +401,10 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreNick(User* user, const std::string& newnick)
+       void OnUserPostNick(User* user, const std::string& oldnick)
        {
                if (!tracknick)
                        RemoveFromAllAccepts(user);
-               return MOD_RES_PASSTHRU;
        }
 
        void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)
@@ -422,11 +414,11 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               cmd.maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
-               operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0);
-               tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0);
-               notify_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true);
+               ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
+               cmd.maxaccepts = tag->getInt("maxaccepts", 16);
+               operoverride = tag->getBool("operoverride");
+               tracknick = tag->getBool("tracknick");
+               notify_cooldown = tag->getInt("cooldown", 60);
        }
 };