* | 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
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
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
private:
AuditoriumMode* aum;
bool ShowOps;
+ bool OperOverride;
CUList nl;
CUList except_list;
public:
: 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'))
{
}
}
- 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'))
{
}
}
- 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'))
{
}
}
- 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<std::string> to_leave;
const char* parameters[2];
if (parthandler)
projects / user / henk / code / inspircd.git / blobdiff