* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
#include "inspircd.h"
-#include "wildcard.h"
/* $ModDesc: Provides the TITLE command which allows setting of CUSTOM WHOIS TITLE line */
*/
class CommandTitle : public Command
{
-
public:
CommandTitle (InspIRCd* Instance) : Command(Instance,"TITLE",0,2)
{
TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
}
-bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
-{
- std::stringstream hl(hostlist);
- std::string xhost;
- while (hl >> xhost)
- {
- if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
- {
- return true;
- }
- }
- return false;
-}
-
- CmdResult Handle(const char** parameters, int pcnt, User* user)
+ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
+ {
+ std::stringstream hl(hostlist);
+ std::string xhost;
+ while (hl >> xhost)
+ {
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ CmdResult Handle(const std::vector<std::string> ¶meters, User* user)
{
- if (!IS_LOCAL(user))
- return CMD_LOCALONLY;
-
char TheHost[MAXBUF];
char TheIP[MAXBUF];
- snprintf(TheHost,MAXBUF,"%s@%s",user->ident,user->host);
- snprintf(TheIP, MAXBUF,"%s@%s",user->ident,user->GetIPString());
+ snprintf(TheHost,MAXBUF,"%s@%s",user->ident.c_str(), user->host.c_str());
+ snprintf(TheIP, MAXBUF,"%s@%s",user->ident.c_str(), user->GetIPString());
ConfigReader Conf(ServerInstance);
for (int i=0; i<Conf.Enumerate("title"); i++)
{
std::string name = Conf.ReadValue("title", "name", "", i);
std::string pass = Conf.ReadValue("title", "password", "", i);
+ std::string hash = Conf.ReadValue("title", "hash", "", i);
std::string host = Conf.ReadValue("title", "host", "*@*", i);
std::string title = Conf.ReadValue("title", "title", "", i);
std::string vhost = Conf.ReadValue("title", "vhost", "", i);
- if (!strcmp(name.c_str(),parameters[0]) && !strcmp(pass.c_str(),parameters[1]) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
+ if (!strcmp(name.c_str(),parameters[0].c_str()) && !ServerInstance->PassCompare(user, pass.c_str(), parameters[1].c_str(), hash.c_str()) && OneOfMatches(TheHost,TheIP,host.c_str()) && !title.empty())
{
std::string* text;
- user->GetExt("ctitle", text);
-
- if (text)
+ if (user->GetExt("ctitle", text))
{
user->Shrink("ctitle");
delete text;
text = new std::string(title);
user->Extend("ctitle", text);
- std::deque<std::string>* metadata = new std::deque<std::string>;
- metadata->push_back(user->nick);
- metadata->push_back("ctitle"); // The metadata id
- metadata->push_back(*text); // The value to send
- Event event((char*)metadata,(Module*)this,"send_metadata");
- event.Send(ServerInstance);
- delete metadata;
-
+ ServerInstance->PI->SendMetaData(user, "ctitle", *text);
+
if (!vhost.empty())
user->ChangeDisplayedHost(vhost.c_str());
- if (!ServerInstance->ULine(user->server))
- // Ulines set TITLEs silently
- ServerInstance->WriteOpers("*** %s used TITLE to set custom title '%s'",user->nick,title.c_str());
+ user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick.c_str(), title.c_str());
- user->WriteServ("NOTICE %s :Custom title set to '%s'",user->nick, title.c_str());
-
- return CMD_SUCCESS;
+ return CMD_LOCALONLY;
}
}
- if (!ServerInstance->ULine(user->server))
- // Ulines also fail TITLEs silently
- ServerInstance->WriteOpers("*** Failed TITLE attempt by %s!%s@%s using login '%s'",user->nick,user->ident,user->host,parameters[0]);
-
- user->WriteServ("NOTICE %s :Invalid title credentials",user->nick);
- return CMD_SUCCESS;
+ user->WriteServ("NOTICE %s :Invalid title credentials",user->nick.c_str());
+ return CMD_LOCALONLY;
}
};
class ModuleCustomTitle : public Module
{
- CommandTitle* mycommand;
-
+ CommandTitle cmd;
+
public:
- ModuleCustomTitle(InspIRCd* Me) : Module(Me)
+ ModuleCustomTitle(InspIRCd* Me) : Module(Me), cmd(Me)
{
-
- mycommand = new CommandTitle(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup };
+ ServerInstance->AddCommand(&cmd);
+ Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUser, I_OnUserQuit, I_OnCleanup };
ServerInstance->Modules->Attach(eventlist, this, 5);
}
- void Implements(char* List)
- {
- List[I_OnDecodeMetaData] = List[I_OnWhoisLine] = List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = 1;
- }
// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
{
/* Insert our numeric before 312 */
std::string* ctitle;
- dest->GetExt("ctitle", ctitle);
- if (ctitle)
+ if (dest->GetExt("ctitle", ctitle))
{
- ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick,dest->nick,ctitle->c_str());
+ ServerInstance->SendWhoisLine(user, dest, 320, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), ctitle->c_str());
}
}
/* Dont block anything */
// this method is called. We should use the ProtoSendMetaData function after we've
// corrected decided how the data should look, to send the metadata on its way if
// it is ours.
- virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+ virtual void OnSyncUser(User* user, Module* proto, void* opaque)
{
- // check if the linking module wants to know about OUR metadata
- if (extname == "ctitle")
- {
- // check if this user has an ctitle field to send
- std::string* ctitle;
- user->GetExt("ctitle", ctitle);
- if (ctitle)
- {
- // call this function in the linking module, let it format the data how it
- // sees fit, and send it on its way. We dont need or want to know how.
- proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*ctitle);
- }
- }
+ // check if this user has an ctitle field to send
+ std::string* ctitle;
+ if (user->GetExt("ctitle", ctitle))
+ proto->ProtoSendMetaData(opaque,user,"ctitle",*ctitle);
}
// when a user quits, tidy up their metadata
virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
{
std::string* ctitle;
- user->GetExt("ctitle", ctitle);
- if (ctitle)
+ if (user->GetExt("ctitle", ctitle))
{
user->Shrink("ctitle");
delete ctitle;
{
User* user = (User*)item;
std::string* ctitle;
- user->GetExt("ctitle", ctitle);
- if (ctitle)
+ if (user->GetExt("ctitle", ctitle))
{
user->Shrink("ctitle");
delete ctitle;
// In our case we're only sending a single string around, so we just construct a std::string.
// Some modules will probably get much more complex and format more detailed structs and classes
// in a textual way for sending over the link.
- virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+ virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
{
+ User* dest = dynamic_cast<User*>(target);
// check if its our metadata key, and its associated with a user
- if ((target_type == TYPE_USER) && (extname == "ctitle"))
+ if (dest && (extname == "ctitle"))
{
- User* dest = (User*)target;
- // if they dont already have an ctitle field, accept the remote server's
std::string* text;
- if (!dest->GetExt("ctitle", text))
+ if (dest->GetExt("ctitle", text))
+ {
+ dest->Shrink("ctitle");
+ delete text;
+ }
+ if (!extdata.empty())
{
- std::string* text = new std::string(extdata);
- dest->Extend("ctitle",text);
+ text = new std::string(extdata);
+ dest->Extend("ctitle", text);
}
}
}
-
+
virtual ~ModuleCustomTitle()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff