using namespace std;
-#include <stdio.h>
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include <string>
-#include "helperfuncs.h"
#include "hashcomp.h"
+#include "inspircd.h"
/* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
+/** Channel mode +R - unidentified users cannot join
+ */
class AChannel_R : public ModeHandler
{
public:
- AChannel_R() : ModeHandler('R', 0, 0, false, MODETYPE_CHANNEL, false) { }
+ AChannel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
{
}
};
+/** User mode +R - unidentified users cannot message
+ */
class AUser_R : public ModeHandler
{
public:
- AUser_R() : ModeHandler('R', 0, 0, false, MODETYPE_USER, false) { }
+ AUser_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
{
}
};
+/** Channel mode +M - unidentified users cannot message channel
+ */
class AChannel_M : public ModeHandler
{
public:
- AChannel_M() : ModeHandler('M', 0, 0, false, MODETYPE_CHANNEL, false) { }
+ AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
{
{
if (channel->IsModeSet('M'))
{
- channel->SetMode('M',true);
+ channel->SetMode('M',false);
return MODEACTION_ALLOW;
}
}
class ModuleServicesAccount : public Module
{
- Server *Srv;
+
AChannel_R* m1;
AChannel_M* m2;
AUser_R* m3;
public:
- ModuleServicesAccount(Server* Me) : Module::Module(Me)
+ ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me)
{
- Srv = Me;
- m1 = new AChannel_R();
- m2 = new AChannel_M();
- m3 = new AUser_R();
- Srv->AddMode(m1, 'R');
- Srv->AddMode(m2, 'M');
- Srv->AddMode(m3, 'R');
- }
-
- virtual void On005Numeric(std::string &output)
- {
- InsertMode(output, "RM", 4);
+
+ m1 = new AChannel_R(ServerInstance);
+ m2 = new AChannel_M(ServerInstance);
+ m3 = new AUser_R(ServerInstance);
+ ServerInstance->AddMode(m1, 'R');
+ ServerInstance->AddMode(m2, 'M');
+ ServerInstance->AddMode(m3, 'R');
}
/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
virtual void OnWhois(userrec* source, userrec* dest)
{
- char *account = dest->GetExt("accountname");
+ std::string *account;
+ dest->GetExt("accountname", account);
if (account)
{
- std::string* accountn = (std::string*)account;
- WriteServ(source->fd, "330 %s %s %s :is logged in as", source->nick, dest->nick, accountn->c_str());
+ source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
}
}
void Implements(char* List)
{
- List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+ List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1;
}
virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
{
- char *account = user->GetExt("accountname");
+ std::string *account;
+ user->GetExt("accountname", account);
if (target_type == TYPE_CHANNEL)
{
if ((c->IsModeSet('M')) && (!account))
{
- if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
+ if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +M channel and is not registered
- Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
+ user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
return 1;
}
}
if ((u->modes['R'-65]) && (!account))
{
- if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+ if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +R user and is not registered
- Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
+ user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
return 1;
}
}
virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
{
- char *account = user->GetExt("accountname");
+ std::string *account;
+ user->GetExt("accountname", account);
if (chan)
{
{
if (!account)
{
- if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
+ if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
{
// user is ulined, won't be stopped from joining
return 0;
}
// joining a +R channel and not identified
- Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
+ user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
return 1;
}
}
if (extname == "accountname")
{
// check if this user has an swhois field to send
- char* field = user->GetExt("accountname");
- if (field)
+ std::string* account;
+ user->GetExt("accountname", account);
+ if (account)
{
- // get our extdata out with a cast
- std::string* account = (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,*account);
// when a user quits, tidy up their metadata
virtual void OnUserQuit(userrec* user, const std::string &message)
{
- char* field = user->GetExt("accountname");
- if (field)
+ std::string* account;
+ user->GetExt("accountname", account);
+ if (account)
{
- std::string* account = (std::string*)field;
user->Shrink("accountname");
delete account;
}
if (target_type == TYPE_USER)
{
userrec* user = (userrec*)item;
- char* field = user->GetExt("accountname");
- if (field)
+ std::string* account;
+ user->GetExt("accountname", account);
+ if (account)
{
- std::string* account = (std::string*)field;
user->Shrink("accountname");
delete account;
}
/* logging them out? */
if (extdata == "")
{
- char* field = dest->GetExt("accountname");
- if (field)
+ std::string* account;
+ dest->GetExt("accountname", account);
+ if (account)
{
- std::string* account = (std::string*)field;
dest->Shrink("accountname");
delete account;
}
else
{
// if they dont already have an accountname field, accept the remote server's
- if (!dest->GetExt("accountname"))
+ std::string* text;
+ if (!dest->GetExt("accountname", text))
{
- std::string* text = new std::string(extdata);
- dest->Extend("accountname",(char*)text);
+ text = new std::string(extdata);
+ dest->Extend("accountname", text);
}
}
}
virtual ~ModuleServicesAccount()
{
+ ServerInstance->Modes->DelMode(m1);
+ ServerInstance->Modes->DelMode(m2);
+ ServerInstance->Modes->DelMode(m3);
DELETE(m1);
DELETE(m2);
DELETE(m3);
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+ return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
}
};
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleServicesAccount(Me);
}
projects / user / henk / code / inspircd.git / blobdiff