m_spanningtree Remove unneeded #includes

[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 7f843f25253e15dee448d4f3ac412ef93defa380..e8448bc91a0e6b6515b0b2d2eb3fb6aa0e7b6130 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -292,7 +292,6 @@ public:
 
 class ModuleCallerID : public Module
 {
-private:
        CommandAccept cmd;
        User_g myumode;
 
@@ -343,18 +342,14 @@ public:
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ~ModuleCallerID()
-       {
-       }
-
        virtual Version GetVersion()
        {
                return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
        }
 
-       virtual void On005Numeric(std::string& output)
+       virtual void On005Numeric(std::map<std::string, std::string>& tokens)
        {
-               output += " CALLERID=g";
+               tokens["CALLERID"] = "g";
        }
 
        ModResult PreText(User* user, User* dest, std::string& text)
@@ -362,7 +357,7 @@ public:
                if (!dest->IsModeSet('g'))
                        return MOD_RES_PASSTHRU;
 
-               if (operoverride && IS_OPER(user))
+               if (operoverride && user->IsOper())
                        return MOD_RES_PASSTHRU;
 
                callerid_data* dat = cmd.extInfo.get(dest, true);
@@ -423,5 +418,3 @@ public:
 };
 
 MODULE_INIT(ModuleCallerID)
-
-