X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=7e6e3121c6a9fd79efe5717a8acabcd05201e8e2;hb=7c197db72eab03321e4f3e847054e13126520504;hp=0a7e3adff18b58259a0d300dbc0c04b1f37ce035;hpb=6050df73f498d05597fb37c6157868df1f6f4db2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp index 0a7e3adff..7e6e3121c 100644 --- a/src/modules/m_services.cpp +++ b/src/modules/m_services.cpp @@ -2,36 +2,26 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 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 #include "users.h" #include "channels.h" #include "modules.h" -#include - -#include "commands.h" -#include "hashcomp.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 { @@ -43,19 +33,19 @@ class Channel_r : public ModeHandler // 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,'.')))) { - 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->WriteServ("500 %s :Only a server may modify the +r channel mode", source->nick); return MODEACTION_DENY; } } }; +/** User mode +r - mark a user as identified + */ class User_r : public ModeHandler { @@ -66,19 +56,23 @@ class User_r : public ModeHandler { if ((kludgeme) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server || (strchr(source->nick,'.')))) { - 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->WriteServ("500 %s :Only a server may modify the +r user mode", source->nick); return MODEACTION_DENY; } } }; +/** Channel mode +R - registered users only + */ class Channel_R : public ModeHandler { public: @@ -107,6 +101,8 @@ class Channel_R : public ModeHandler } }; +/** User mode +R - only allow PRIVMSG and NOTICE from registered users + */ class User_R : public ModeHandler { public: @@ -135,6 +131,8 @@ class User_R : public ModeHandler } }; +/** Channel mode +M - only allow privmsg and notice to channel from registered users + */ class Channel_M : public ModeHandler { public: @@ -154,7 +152,7 @@ class Channel_M : public ModeHandler { if (channel->IsModeSet('M')) { - channel->SetMode('M',true); + channel->SetMode('M',false); return MODEACTION_ALLOW; } } @@ -163,6 +161,8 @@ class Channel_M : public ModeHandler } }; +/** Dreamnforge-like services support + */ class ModuleServices : public Module { @@ -181,17 +181,14 @@ class ModuleServices : public Module 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'); - kludgeme = false; - } - virtual void On005Numeric(std::string &output) - { - ServerInstance->Modes->InsertMode(output, "rRM", 4); + if (!ServerInstance->AddMode(m1, 'r') || !ServerInstance->AddMode(m2, 'R') || !ServerInstance->AddMode(m3, 'M') + || !ServerInstance->AddMode(m4, 'r') || !ServerInstance->AddMode(m5, 'R')) + { + throw ModuleException("Could not add user and channel modes!"); + } + + kludgeme = false; } /* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */ @@ -200,13 +197,13 @@ class ModuleServices : public Module 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, dest->nick); } } void Implements(char* List) { - List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1; + 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) @@ -223,27 +220,30 @@ class ModuleServices : public Module } } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreMessage(userrec* 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; if ((c->IsModeSet('M')) && (!user->IsModeSet('r'))) { - if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,""))) + if ((ServerInstance->ULine(user->nick)) || (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->WriteServ("477 %s %s :You need a registered nickname to speak on this channel", user->nick, c->name); return 1; } } if (target_type == TYPE_USER) { userrec* u = (userrec*)dest; - if ((u->IsModeSet('R')) && (user->IsModeSet('r'))) + if ((u->IsModeSet('R')) && (!user->IsModeSet('r'))) { if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { @@ -251,25 +251,25 @@ class ModuleServices : public Module 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->WriteServ("477 %s %s :You need a registered nickname to message this user", user->nick, u->nick); return 1; } } return 0; } - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status) + virtual int OnUserPreNotice(userrec* 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(userrec* user, chanrec* chan, const char* cname, std::string &privs) { if (chan) { if (chan->IsModeSet('R')) { - if (user->IsModeSet('r')) + if (!user->IsModeSet('r')) { if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server))) { @@ -277,7 +277,7 @@ class ModuleServices : public Module 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->WriteServ("477 %s %s :You need a registered nickname to join this channel", user->nick, chan->name); return 1; } } @@ -287,6 +287,12 @@ class ModuleServices : public Module virtual ~ModuleServices() { + kludgeme = true; + ServerInstance->Modes->DelMode(m1); + ServerInstance->Modes->DelMode(m2); + ServerInstance->Modes->DelMode(m3); + ServerInstance->Modes->DelMode(m4); + ServerInstance->Modes->DelMode(m5); DELETE(m1); DELETE(m2); DELETE(m3); @@ -296,7 +302,7 @@ class ModuleServices : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); } };