X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=4dec57df9460ad489ad5d8d5307c7069d2eccc05;hb=f8ccaed31d68661d16eae1a412b337af09de111b;hp=f6b1ff3d8d2c4ce8240cc13ab9fdd720a7faf3cc;hpb=2f00b255ec337d2ca8422788d3b574fcd2ac81b9;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index f6b1ff3d8..4dec57df9 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,9 +11,6 @@ * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" /* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */ @@ -21,22 +18,17 @@ class AuditoriumMode : public ModeHandler { public: - AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { } + AuditoriumMode(Module* Creator) : ModeHandler(Creator, "auditorium", 'u', PARAM_NONE, MODETYPE_CHANNEL) + { + levelrequired = OP_VALUE; + } - 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) { if (channel->IsModeSet('u') != adding) { - if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) - { - source->WriteServ("482 %s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - channel->SetMode('u', adding); - return MODEACTION_ALLOW; - } + channel->SetMode('u', adding); + return MODEACTION_ALLOW; } else { @@ -48,126 +40,113 @@ class AuditoriumMode : public ModeHandler class ModuleAuditorium : public Module { private: - AuditoriumMode* aum; + AuditoriumMode aum; + bool ShowOps; + bool OperOverride; public: - ModuleAuditorium(InspIRCd* Me) - : Module::Module(Me) + ModuleAuditorium() + : aum(this) { - aum = new AuditoriumMode(ServerInstance); - if (!ServerInstance->AddMode(aum, 'u')) + if (!ServerInstance->Modes->AddMode(&aum)) throw ModuleException("Could not add new modes!"); - } - - virtual ~ModuleAuditorium() - { - ServerInstance->Modes->DelMode(aum); - DELETE(aum); - } - Priority Prioritize() - { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->PriorityBefore("m_namesx.so"); + OnRehash(NULL); + + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 6); + } - virtual Version GetVersion() + ~ModuleAuditorium() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - void Implements(char* List) + void OnRehash(User* user) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 1; + ConfigReader conf; + ShowOps = conf.ReadFlag("auditorium", "showops", 0); + OperOverride = conf.ReadFlag("auditorium", "operoverride", 0); } - virtual int OnUserList(userrec* user, chanrec* Ptr) + Version GetVersion() { - if (Ptr->IsModeSet('u')) - { - /* HELLOOO, IS ANYBODY THERE? -- nope, just us. */ - user->WriteServ("353 %s = %s :%s", user->nick, Ptr->name, user->nick); - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - return 1; - } - return 0; + return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_VENDOR); } - - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + + void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) { - if (channel->IsModeSet('u')) + if (!memb->chan->IsModeSet('u')) + return; + + /* Some module hid this from being displayed, dont bother */ + if (nick.empty()) + return; + + /* If user is oper and operoverride is on, don't touch the list */ + if (OperOverride && issuer->HasPrivPermission("channels/auspex")) + return; + + if (ShowOps && (issuer != memb->user) && (memb->getRank() < OP_VALUE)) { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ - user->WriteFrom(user, "JOIN %s", channel->name); + /* Showops is set, hide all non-ops from the user, except themselves */ + nick.clear(); + return; } - } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) - { - if (channel->IsModeSet('u')) + if (!ShowOps && (issuer != memb->user)) { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - user->WriteFrom(user, "PART %s%s%s", channel->name, - partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); + /* ShowOps is not set, hide everyone except the user whos requesting NAMES */ + nick.clear(); + return; } } - void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) + void BuildExcept(Membership* memb, CUList& excepts) { - if (chan->IsModeSet('u')) + if (!memb->chan->IsModeSet('u')) + return; + if (ShowOps && memb->getRank() >= OP_VALUE) + return; + + const UserMembList* users = memb->chan->GetUsers(); + for(UserMembCIter i = users->begin(); i != users->end(); i++) { - silent = true; - /* Send silenced event only to the user being kicked and the user doing the kick */ - source->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); - user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); + if (i->first == memb->user || !IS_LOCAL(i->first)) + continue; + if (ShowOps && i->second->getRank() >= OP_VALUE) + continue; + if (OperOverride && i->first->HasPrivPermission("channels/auspex")) + continue; + // This is a different user in the channel, local, and not op/oper + // so, hide the join from them + excepts.insert(i->first); } } - - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - const char* parameters[2]; - if (parthandler) - { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - { - if (f->first->IsModeSet('u')) - to_leave.push_back(f->first->name); - } - /* We cant do this neatly in one loop, as we are modifying the map we are iterating */ - for (std::vector::iterator n = to_leave.begin(); n != to_leave.end(); n++) - { - parameters[0] = n->c_str(); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); - } - } + BuildExcept(memb, excepts); } -}; -class ModuleAuditoriumFactory : public ModuleFactory -{ - public: - ModuleAuditoriumFactory() + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) { + BuildExcept(memb, excepts); } - - ~ModuleAuditoriumFactory() + + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { + BuildExcept(memb, excepts); } - - virtual Module * CreateModule(InspIRCd* Me) + + void OnBuildNeighborList(User* source, UserChanList &include, std::map &exception) { - return new ModuleAuditorium(Me); + UCListIter i = include.begin(); + while (i != include.end()) + { + Channel* c = *i++; + if (c->IsModeSet('u')) + include.erase(c); + } } - }; -extern "C" void * init_module( void ) -{ - return new ModuleAuditoriumFactory; -} - +MODULE_INIT(ModuleAuditorium)