Raise the default max number of ACCEPT entries from 16 to 30.

[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 d69f5606f00c865a9475d7b5daeff1d028b9a21d..cdb10c04c79ebc197fed3d64a758582be5a8982a 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -91,7 +91,7 @@ struct CallerIDExtInfo : public ExtensionItem
 
                void* old = get_raw(container);
                if (old)
-                       this->free(old);
+                       this->free(NULL, old);
                callerid_data* dat = new callerid_data;
                set_raw(container, dat);
 
@@ -125,7 +125,7 @@ struct CallerIDExtInfo : public ExtensionItem
                return dat;
        }
 
-       void free(void* item) CXX11_OVERRIDE
+       void free(Extensible* container, void* item) CXX11_OVERRIDE
        {
                callerid_data* dat = static_cast<callerid_data*>(item);
 
@@ -201,7 +201,7 @@ public:
         * /accept nick1,nick2,nick3,*
         * to add 3 nicks and then show your list
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (CommandParser::LoopCall(user, this, parameters, 0))
                        return CMD_SUCCESS;
@@ -234,7 +234,7 @@ public:
                        return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE);
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                // There is a list in parameters[0] in two cases:
                // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists,
@@ -330,7 +330,6 @@ class ModuleCallerID : public Module
        SimpleUserModeHandler myumode;
 
        // Configuration variables:
-       bool operoverride; // Operators can override callerid.
        bool tracknick; // Allow ACCEPT entries to update with nick changes.
        unsigned int notify_cooldown; // Seconds between notifications.
 
@@ -384,7 +383,7 @@ public:
                if (!dest->IsModeSet(myumode) || (user == dest))
                        return MOD_RES_PASSTHRU;
 
-               if (operoverride && user->IsOper())
+               if (user->HasPrivPermission("users/callerid-override"))
                        return MOD_RES_PASSTHRU;
 
                callerid_data* dat = cmd.extInfo.get(dest, true);
@@ -419,8 +418,7 @@ public:
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
-               cmd.maxaccepts = tag->getInt("maxaccepts", 16);
-               operoverride = tag->getBool("operoverride");
+               cmd.maxaccepts = tag->getUInt("maxaccepts", 30);
                tracknick = tag->getBool("tracknick");
                notify_cooldown = tag->getDuration("cooldown", 60);
        }