X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=8da062593f99ed2f2f157bdfab7866a72ee0d2d9;hb=8cebe2878f3878afce6f643d93668155cb26801d;hp=c60bed9b9e6151f14b4a10732842f2651cbfcc01;hpb=bb6a9af0cf3ce7c66bc131f4ba37d6c0f7008841;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index c60bed9b9..8da062593 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-2009 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,14 @@ class AuditoriumMode : public ModeHandler { public: - AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { } + AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false, 0, '@') { } - 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 (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,73 +37,141 @@ class AuditoriumMode : public ModeHandler class ModuleAuditorium : public Module { private: - AuditoriumMode* aum; + AuditoriumMode aum; + bool ShowOps; + bool OperOverride; public: ModuleAuditorium(InspIRCd* Me) - : Module::Module(Me) + : Module(Me), aum(Me) { - aum = new AuditoriumMode(ServerInstance); - if (!ServerInstance->AddMode(aum, 'u')) + if (!ServerInstance->Modes->AddMode(&aum)) throw ModuleException("Could not add new modes!"); + + OnRehash(NULL); + + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle }; + Me->Modules->Attach(eventlist, this, 7); + } - + virtual ~ModuleAuditorium() { - ServerInstance->Modes->DelMode(aum); - DELETE(aum); + ServerInstance->Modes->DelMode(&aum); } - Priority Prioritize() + virtual void OnRehash(User* user) { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->PriorityBefore("m_namesx.so"); + ConfigReader conf(ServerInstance); + ShowOps = conf.ReadFlag("auditorium", "showops", 0); + OperOverride = conf.ReadFlag("auditorium", "operoverride", 0); } virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - void Implements(char* List) + virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 1; + if (!channel->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 != user) && (channel->GetStatus(user) < STATUS_OP)) + { + /* Showops is set, hide all non-ops from the user, except themselves */ + nick.clear(); + return; + } + + if (!ShowOps && (issuer != user)) + { + /* ShowOps is not set, hide everyone except the user whos requesting NAMES */ + nick.clear(); + return; + } } - virtual int OnUserList(userrec* user, chanrec* Ptr) + void WriteOverride(User* source, Channel* channel, const std::string &text) { - if (Ptr->IsModeSet('u')) + if (!OperOverride) + return; + + CUList *ulist = channel->GetUsers(); + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - /* 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; + if (i->first->HasPrivPermission("channels/auspex") && source != i->first) + if (!ShowOps || (ShowOps && channel->GetStatus(i->first) < STATUS_OP)) + i->first->WriteFrom(source, "%s",text.c_str()); } - return 0; } - - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) { if (channel->IsModeSet('u')) + { 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.c_str()); + if (ShowOps) + channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "JOIN %s", channel->name.c_str()); + WriteOverride(user, channel, "JOIN "+channel->name); + } } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) { if (channel->IsModeSet('u')) + { 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.c_str(), + partmessage.empty() ? "" : " :", + partmessage.empty() ? "" : partmessage.c_str()); + if (ShowOps) + { + channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :", + partmessage.empty() ? "" : partmessage.c_str()); + } + WriteOverride(user, channel, "PART " + channel->name + (partmessage.empty() ? "" : (" :" + partmessage))); + } } - void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) + void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) { if (chan->IsModeSet('u')) + { 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.c_str(), user->nick.c_str(), reason.c_str()); + if (ShowOps) + chan->WriteAllExceptSender(source, false, chan->GetStatus(user) >= STATUS_OP ? 0 : '@', "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); + if ((!ShowOps) || (chan->GetStatus(user) < STATUS_OP)) /* make sure the target gets the event */ + user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); + WriteOverride(source, chan, "KICK " + chan->name + " " + user->nick + " " + reason); + } } - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + bool OnHostCycle(User* user) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); + for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + if (f->first->IsModeSet('u')) + return true; + + return false; + } + + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) + { + Command* 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++) @@ -125,34 +182,13 @@ class ModuleAuditorium : public Module /* 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(); + std::vector parameters; + parameters.push_back(*n); /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); + parthandler->Handle(parameters, user); } } } }; -class ModuleAuditoriumFactory : public ModuleFactory -{ - public: - ModuleAuditoriumFactory() - { - } - - ~ModuleAuditoriumFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleAuditorium(Me); - } - -}; - -extern "C" void * init_module( void ) -{ - return new ModuleAuditoriumFactory; -} - +MODULE_INIT(ModuleAuditorium)