X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=75f953f437f19dd5553701e88c00524320dba740;hb=f9ef4ebc9dc4fd46cdafcc76df644b4896251dac;hp=166d1bcc44c3fdea69a984d2721b51319425c3c4;hpb=ce533b67e6c58c02f25b2f26214ab9cd2c7c99b6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 166d1bcc4..75f953f43 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -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 */ @@ -23,13 +20,13 @@ class AuditoriumMode : public ModeHandler public: AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 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) { 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"); + source->WriteNumeric(482, "%s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un"); return MODEACTION_DENY; } else @@ -50,79 +47,74 @@ class ModuleAuditorium : public Module private: AuditoriumMode* aum; bool ShowOps; + bool OperOverride; CUList nl; CUList except_list; public: ModuleAuditorium(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { aum = new AuditoriumMode(ServerInstance); - if (!ServerInstance->AddMode(aum, 'u')) + if (!ServerInstance->Modes->AddMode(aum)) + { + delete aum; throw ModuleException("Could not add new modes!"); + } + OnRehash(NULL, ""); + + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash }; + Me->Modules->Attach(eventlist, this, 6); + } virtual ~ModuleAuditorium() { ServerInstance->Modes->DelMode(aum); - DELETE(aum); + delete aum; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader conf(ServerInstance); ShowOps = conf.ReadFlag("auditorium", "showops", 0); - } - - Priority Prioritize() - { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->PriorityBefore("m_namesx.so"); + OperOverride = conf.ReadFlag("auditorium", "operoverride", 0); } virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version(1, 2, 0, 0, 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] = List[I_OnRehash] = 1; - } + if (!channel->IsModeSet('u')) + return; - virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &nameslist) - { - if (Ptr->IsModeSet('u')) + /* 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 && IS_OPER(user)) + return; + + if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP)) { - if (ShowOps) - { - /* Leave the names list alone, theyre an op - * doing /names on the channel after joining it - */ - if (Ptr->GetStatus(user) >= STATUS_OP) - { - nameslist = Ptr->GetUsers(); - return 0; - } - - /* Show all the opped users */ - nl = *(Ptr->GetOppedUsers()); - nl[user] = user->nick; - nameslist = &nl; - return 0; - } - else - { - /* 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; - } + /* 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; } - return 0; } - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent) { if (channel->IsModeSet('u')) { @@ -134,7 +126,7 @@ class ModuleAuditorium : public Module } } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent) { if (channel->IsModeSet('u')) { @@ -151,7 +143,7 @@ class ModuleAuditorium : public Module } } - 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')) { @@ -165,11 +157,10 @@ class ModuleAuditorium : public Module } } - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); + 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++) @@ -180,34 +171,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)