X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=364560669e5cb30dce301d8c7fd2de2bb9ad9801;hb=117742632909d9bfd71fc4feb3304263558101b7;hp=9e3b53fe400f00252741b1e9d124dc48169da7a1;hpb=e21ee18e62aecee6d27a0f9ba497a52688cb8349;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 9e3b53fe4..364560669 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-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -26,7 +26,7 @@ class AuditoriumMode : public ModeHandler { 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(ERR_CHANOPRIVSNEEDED, "%s %s :Only channel operators may %sset channel mode +u", source->nick.c_str(), channel->name.c_str(), adding ? "" : "un"); return MODEACTION_DENY; } else @@ -48,8 +48,6 @@ class ModuleAuditorium : public Module AuditoriumMode* aum; bool ShowOps; bool OperOverride; - CUList nl; - CUList except_list; public: ModuleAuditorium(InspIRCd* Me) : Module(Me) @@ -63,23 +61,17 @@ class ModuleAuditorium : public Module OnRehash(NULL, ""); - Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnUserList, I_OnRehash }; - Me->Modules->Attach(eventlist, this, 6); + 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; } - void Prioritize() - { - Module* namesx = ServerInstance->Modules->Find("m_namesx.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx); - } - virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader conf(ServerInstance); @@ -89,76 +81,61 @@ class ModuleAuditorium : public Module virtual Version GetVersion() { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist) + virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) { - if (Ptr->IsModeSet('u')) + 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 && user->HasPrivPermission("channels/auspex")) + return; + + if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP)) { - if (OperOverride) - { - if (IS_OPER(user)) - { - /* - * If user is oper and operoverride is on, don't touch the list - */ - return 0; - } - } - - 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 %c %s :%s", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', 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(User* user, Channel* channel, bool sync, bool &silent) { 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); + user->WriteFrom(user, "JOIN %s", channel->name.c_str()); if (ShowOps) - channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "JOIN %s", channel->name); + channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "JOIN %s", channel->name.c_str()); } } - void OnUserPart(User* user, Channel* 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, + user->WriteFrom(user, "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :", partmessage.empty() ? "" : partmessage.c_str()); if (ShowOps) { - channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "PART %s%s%s", channel->name, partmessage.empty() ? "" : " :", + 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()); } } @@ -170,19 +147,27 @@ class ModuleAuditorium : public Module { 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()); + source->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); if (ShowOps) - chan->WriteAllExcept(source, false, chan->GetStatus(source) >= STATUS_OP ? 0 : '@', except_list, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); - else - user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); + 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()); } } + bool OnHostCycle(User* user) + { + 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++) @@ -193,9 +178,10 @@ 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); } } }