if (it2 != targ->wholistsme.end())
targ->wholistsme.erase(it2);
}
+ delete dat;
}
};
CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1),
extInfo(Creator)
{
+ allow_empty_last_param = false;
syntax = "{[+|-]<nicks>}|*}";
TRANSLATE2(TR_CUSTOM, TR_END);
}
{
if (index != 0)
return;
- std::string out = "";
+ std::string out;
irc::commasepstream nicks(parameter);
std::string tok;
while (nicks.GetToken(tok))
class ModuleCallerID : public Module
{
-private:
CommandAccept cmd;
User_g myumode;
ServerInstance->Modules->AddService(cmd.extInfo);
Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
- ServerInstance->Modules->Attach(eventlist, this, 6);
- }
-
- virtual ~ModuleCallerID()
- {
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
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)
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);
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);
}
};
MODULE_INIT(ModuleCallerID)
-
-