#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
/* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
+
+
class cmd_swhois : public command_t
{
- Server* Srv;
+
public:
- cmd_swhois(Server* server) : command_t("SWHOIS",'o',2)
+ cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
{
- this->Srv = server;
this->source = "m_swhois.so";
+ syntax = "<nick> <swhois>";
}
- void Handle(char** parameters, int pcnt, userrec* user)
+ void Handle(const char** parameters, int pcnt, userrec* user)
{
- userrec* dest = Srv->FindNick(std::string(parameters[0]));
+ userrec* dest = ServerInstance->FindNick(parameters[0]);
if(dest)
{
std::string line;
line.append(parameters[i]);
}
- std::string* text = (std::string*)dest->GetExt("swhois");
+ std::string* text;
+ dest->GetExt("swhois", text);
if(text)
{
// We already had it set...
-
- WriteOpers("%s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
+
+ if (!ServerInstance->ULine(user->server))
+ // Ulines set SWHOISes silently
+ ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
dest->Shrink("swhois");
- delete text;
+ DELETE(text);
}
- else
+ else if(!ServerInstance->ULine(user->server))
{
- WriteOpers("%s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
+ // Ulines set SWHOISes silently
+ ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois to '%s'", user->nick, dest->nick, line.c_str());
}
text = new std::string(line);
- dest->Extend("swhois", (char*)text);
+ dest->Extend("swhois", text);
}
}
};
class ModuleSWhois : public Module
{
cmd_swhois* mycommand;
- Server* Srv;
+
ConfigReader* Conf;
public:
- ModuleSWhois(Server* Me) : Module::Module(Me)
+ ModuleSWhois(InspIRCd* Me) : Module::Module(Me)
{
- Srv = Me;
- Conf = new ConfigReader();
- mycommand = new cmd_swhois(Srv);
- Srv->AddCommand(mycommand);
+
+ Conf = new ConfigReader(ServerInstance);
+ mycommand = new cmd_swhois(ServerInstance);
+ ServerInstance->AddCommand(mycommand);
}
- void OnRehash(std::string parameter)
+ void OnRehash(const std::string ¶meter)
{
- delete Conf;
- Conf = new ConfigReader();
+ DELETE(Conf);
+ Conf = new ConfigReader(ServerInstance);
}
void Implements(char* List)
// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
virtual void OnWhois(userrec* source, userrec* dest)
{
- char* desc = dest->GetExt("swhois");
- if (desc)
+ std::string* swhois;
+ dest->GetExt("swhois", swhois);
+ if (swhois)
{
- std::string* swhois = (std::string*)desc;
- WriteServ(source->fd,"320 %s %s :%s",source->nick,dest->nick,swhois->c_str());
+ source->WriteServ("320 %s %s :%s",source->nick,dest->nick,swhois->c_str());
}
}
// 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(userrec* user, Module* proto, void* opaque, std::string extname)
+ virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
{
// check if the linking module wants to know about OUR metadata
if (extname == "swhois")
{
// check if this user has an swhois field to send
- char* field = user->GetExt("swhois");
- if (field)
+ std::string* swhois;
+ user->GetExt("swhois", swhois);
+ if (swhois)
{
- // get our extdata out with a cast
- std::string* swhois = (std::string*)field;
// 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,*swhois);
}
// when a user quits, tidy up their metadata
- virtual void OnUserQuit(userrec* user, std::string message)
+ virtual void OnUserQuit(userrec* user, const std::string &message)
{
- char* field = user->GetExt("swhois");
- if (field)
+ std::string* swhois;
+ user->GetExt("swhois", swhois);
+ if (swhois)
{
- std::string* swhois = (std::string*)field;
user->Shrink("swhois");
- delete swhois;
+ DELETE(swhois);
}
}
if (target_type == TYPE_USER)
{
userrec* user = (userrec*)item;
- char* field = user->GetExt("swhois");
- if (field)
+ std::string* swhois;
+ user->GetExt("swhois", swhois);
+ if (swhois)
{
- std::string* swhois = (std::string*)field;
user->Shrink("swhois");
- delete swhois;
+ DELETE(swhois);
}
}
}
// 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, std::string extname, std::string extdata)
+ virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
{
// check if its our metadata key, and its associated with a user
if ((target_type == TYPE_USER) && (extname == "swhois"))
{
userrec* dest = (userrec*)target;
// if they dont already have an swhois field, accept the remote server's
- if (!dest->GetExt("swhois"))
+ std::string* text;
+ if (!dest->GetExt("swhois", text))
{
std::string* text = new std::string(extdata);
- dest->Extend("swhois",(char*)text);
+ dest->Extend("swhois",text);
}
}
}
- virtual void OnOper(userrec* user, std::string opertype)
+ virtual void OnOper(userrec* user, const std::string &opertype)
{
for(int i =0; i < Conf->Enumerate("type"); i++)
{
{
std::string swhois = Conf->ReadValue("type", "swhois", i);
- if(std::string* old = (std::string*)user->GetExt("swhois"))
+ if(swhois.length())
{
- user->Shrink("swhois");
- delete old;
- }
+ std::string* old;
+ if(user->GetExt("swhois", old))
+ {
+ user->Shrink("swhois");
+ DELETE(old);
+ }
- std::string* text = new std::string(swhois);
- user->Extend("swhois", (char*)text);
-
- break;
+ std::string* text = new std::string(swhois);
+ user->Extend("swhois", text);
+
+ break;
+ }
}
}
}
virtual ~ModuleSWhois()
{
- delete Conf;
+ DELETE(Conf);
}
virtual Version GetVersion()
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleSWhois(Me);
}