* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
static bool kludgeme = false;
/* $ModDesc: Povides support for services +r user/chan modes and more */
+/** Channel mode +r - mark a channel as identified
+ */
class Channel_r : public ModeHandler
{
-
+
public:
Channel_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)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
// only a u-lined server may add or remove the +r mode.
- if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+ if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server || (source->nick.find('.') != std::string::npos)))
{
- ServerInstance->Log(DEBUG,"Allowing cmode +r, server and nick are: '%s','%s'",source->nick,source->server);
channel->SetMode('r',adding);
return MODEACTION_ALLOW;
}
else
{
- ServerInstance->Log(DEBUG,"Only a server can set chanmode +r, server and nick are: '%s','%s'",source->nick,source->server);
- source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r channel mode");
+ source->WriteNumeric(500, "%s :Only a server may modify the +r channel mode", source->nick.c_str());
return MODEACTION_DENY;
}
}
};
+/** User mode +r - mark a user as identified
+ */
class User_r : public ModeHandler
{
-
+
public:
User_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)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
- if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.'))))
+ if ((kludgeme) || (ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server || (source->nick.find('.') != std::string::npos)))
{
- ServerInstance->Log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",source->nick,source->server);
- dest->SetMode('r',adding);
- return MODEACTION_ALLOW;
+ if ((adding && !dest->IsModeSet('r')) || (!adding && dest->IsModeSet('r')))
+ {
+ dest->SetMode('r',adding);
+ return MODEACTION_ALLOW;
+ }
+ return MODEACTION_DENY;
}
else
{
- ServerInstance->Log(DEBUG,"Only a server can set umode +r, server and nick are: '%s','%s'",source->nick, source->server);
- source->WriteServ("500 "+std::string(source->nick)+" :Only a server may modify the +r user mode");
+ source->WriteNumeric(500, "%s :Only a server may modify the +r user mode", source->nick.c_str());
return MODEACTION_DENY;
}
}
};
-class Channel_R : public ModeHandler
+/** Channel mode +R - registered users only
+ */
+class Channel_R : public SimpleChannelModeHandler
{
public:
- Channel_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)
- {
- if (adding)
- {
- if (!channel->IsModeSet('R'))
- {
- channel->SetMode('R',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (channel->IsModeSet('R'))
- {
- channel->SetMode('R',false);
- return MODEACTION_ALLOW;
- }
- }
-
- return MODEACTION_DENY;
- }
+ Channel_R(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'R') { }
};
-class User_R : public ModeHandler
+/** User mode +R - only allow PRIVMSG and NOTICE from registered users
+ */
+class User_R : public SimpleUserModeHandler
{
public:
- User_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)
- {
- if (adding)
- {
- if (!dest->IsModeSet('R'))
- {
- dest->SetMode('R',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (dest->IsModeSet('R'))
- {
- dest->SetMode('R',false);
- return MODEACTION_ALLOW;
- }
- }
-
- return MODEACTION_DENY;
- }
+ User_R(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { }
};
-class Channel_M : public ModeHandler
+/** Channel mode +M - only allow privmsg and notice to channel from registered users
+ */
+class Channel_M : public SimpleChannelModeHandler
{
public:
- Channel_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 (adding)
- {
- if (!channel->IsModeSet('M'))
- {
- channel->SetMode('M',true);
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (channel->IsModeSet('M'))
- {
- channel->SetMode('M',false);
- return MODEACTION_ALLOW;
- }
- }
-
- return MODEACTION_DENY;
- }
+ Channel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'M') { }
};
+/** Dreamnforge-like services support
+ */
class ModuleServices : public Module
{
-
+
Channel_r* m1;
Channel_R* m2;
Channel_M* m3;
User_R* m5;
public:
ModuleServices(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
-
+
m1 = new Channel_r(ServerInstance);
m2 = new Channel_R(ServerInstance);
m3 = new Channel_M(ServerInstance);
m4 = new User_r(ServerInstance);
m5 = new User_R(ServerInstance);
- ServerInstance->AddMode(m1, 'r');
- ServerInstance->AddMode(m2, 'R');
- ServerInstance->AddMode(m3, 'M');
- ServerInstance->AddMode(m4, 'r');
- ServerInstance->AddMode(m5, 'R');
+
+ if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3)
+ || !ServerInstance->Modes->AddMode(m4) || !ServerInstance->Modes->AddMode(m5))
+ {
+ throw ModuleException("Could not add user and channel modes!");
+ }
+
kludgeme = false;
+ Implementation eventlist[] = { I_OnWhois, I_OnUserPostNick, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
}
/* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
- virtual void OnWhois(userrec* source, userrec* dest)
+ virtual void OnWhois(User* source, User* dest)
{
if (dest->IsModeSet('r'))
{
/* user is registered */
- source->WriteServ("307 %s %s :is a registered nick", source->nick, dest->nick);
+ ServerInstance->SendWhoisLine(source, dest, 307, "%s %s :is a registered nick", source->nick.c_str(), dest->nick.c_str());
}
}
- void Implements(char* List)
- {
- List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
- }
- virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
+ virtual void OnUserPostNick(User* user, const std::string &oldnick)
{
/* On nickchange, if they have +r, remove it */
- if (user->IsModeSet('r'))
+ if (user->IsModeSet('r') && assign(user->nick) != oldnick)
{
- const char* modechange[2];
- modechange[0] = user->nick;
- modechange[1] = "-r";
+ std::vector<std::string> modechange;
+ modechange.push_back(user->nick);
+ modechange.push_back("-r");
kludgeme = true;
- ServerInstance->SendMode(modechange,2,user);
+ ServerInstance->SendMode(modechange,user);
kludgeme = false;
}
}
-
- virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+ virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
+ if (!IS_LOCAL(user))
+ return 0;
+
if (target_type == TYPE_CHANNEL)
{
- chanrec* c = (chanrec*)dest;
+ Channel* c = (Channel*)dest;
if ((c->IsModeSet('M')) && (!user->IsModeSet('r')))
{
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
+ if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +M channel and is not registered
- user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need a registered nickname to speak on this channel");
+ user->WriteNumeric(477, "%s %s :You need a registered nickname to speak on this channel", user->nick.c_str(), c->name.c_str());
return 1;
}
}
if (target_type == TYPE_USER)
{
- userrec* u = (userrec*)dest;
+ User* u = (User*)dest;
if ((u->IsModeSet('R')) && (!user->IsModeSet('r')))
{
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
+ if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
{
// user is ulined, can speak regardless
return 0;
}
// user messaging a +R user and is not registered
- user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need a registered nickname to message this user");
+ user->WriteNumeric(477, "%s %s :You need a registered nickname to message this user", user->nick.c_str(), u->nick.c_str());
return 1;
}
}
return 0;
}
-
- virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+
+ virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
- return OnUserPreMessage(user,dest,target_type,text,status);
+ return OnUserPreMessage(user,dest,target_type,text,status, exempt_list);
}
-
- virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+ virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
if (chan)
{
{
if (!user->IsModeSet('r'))
{
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
+ if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
{
// user is ulined, won't be stopped from joining
return 0;
}
// joining a +R channel and not identified
- user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need a registered nickname to join this channel");
+ user->WriteNumeric(477, "%s %s :You need a registered nickname to join this channel", user->nick.c_str(), chan->name.c_str());
return 1;
}
}
ServerInstance->Modes->DelMode(m3);
ServerInstance->Modes->DelMode(m4);
ServerInstance->Modes->DelMode(m5);
- DELETE(m1);
- DELETE(m2);
- DELETE(m3);
- DELETE(m4);
- DELETE(m5);
+ delete m1;
+ delete m2;
+ delete m3;
+ delete m4;
+ delete m5;
}
-
- virtual Version GetVersion()
- {
- return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
- }
-};
-
-class ModuleServicesFactory : public ModuleFactory
-{
- public:
- ModuleServicesFactory()
- {
- }
-
- ~ModuleServicesFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
+ virtual Version GetVersion()
{
- return new ModuleServices(Me);
+ return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
}
-
};
-extern "C" void * init_module( void )
-{
- return new ModuleServicesFactory;
-}
-
+MODULE_INIT(ModuleServices)
projects / user / henk / code / inspircd.git / blobdiff