* | 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 "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
+#include <stdarg.h>
/* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */
{
}
- virtual bool VisibleTo(userrec* user)
+ virtual bool VisibleTo(User* user)
{
return IS_OPER(user);
}
~InvisibleMode()
{
- for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++)
+ for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
if (i->second->Visibility == qo)
i->second->Visibility = NULL;
delete qo;
}
- 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 ((source != dest) && (!*source->oper))
+ if (source != dest)
return MODEACTION_DENY;
if (dest->IsModeSet('Q') != adding)
if (!ok)
{
- source->WriteServ("481 %s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick);
+ source->WriteNumeric(481, "%s :Permission Denied - You do not have access to become invisible via user mode +Q", source->nick);
return MODEACTION_DENY;
}
dest->SetMode('Q', adding);
+ /* Fix for bug #379 reported by stealth. On +/-Q make m_watch think the user has signed on/off */
+ Module* m = ServerInstance->Modules->Find("m_watch.so");
+
+ /* This must come before setting/unsetting the handler */
+ if (m && adding)
+ m->OnUserQuit(dest, "Connection closed", "Connection closed");
+
/* Set visibility handler object */
dest->Visibility = adding ? qo : NULL;
+ /* This has to come after setting/unsetting the handler */
+ if (m && !adding)
+ m->OnPostConnect(dest);
+
/* User appears to vanish or appear from nowhere */
for (UCListIter f = dest->chans.begin(); f != dest->chans.end(); f++)
{
i->first->WriteServ("MODE %s +%s", f->first->name, n.c_str());
}
}
-
- ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost(), adding ? "in" : "", adding ? "+" : "-");
}
+
+ ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has become %svisible (%sQ)", dest->GetFullHost(), adding ? "in" : "", adding ? "+" : "-");
return MODEACTION_ALLOW;
}
else
{
}
- bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string ¶m, bool adding, ModeType type)
+ bool BeforeMode(User* source, User* dest, Channel* channel, std::string ¶m, bool adding, ModeType type, bool)
{
/* Users who are opers and have +Q get their +Q removed when they deoper */
if ((!adding) && (dest->IsModeSet('Q')))
InvisibleDeOper* ido;
public:
ModuleInvisible(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
conf = new ConfigReader(ServerInstance);
qm = new InvisibleMode(ServerInstance);
- if (!ServerInstance->AddMode(qm, 'Q'))
+ if (!ServerInstance->Modes->AddMode(qm))
throw ModuleException("Could not add new modes!");
ido = new InvisibleDeOper(ServerInstance);
- if (!ServerInstance->AddModeWatcher(ido))
+ if (!ServerInstance->Modes->AddModeWatcher(ido))
throw ModuleException("Could not add new mode watcher on usermode +o!");
+
+ /* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */
+ ServerInstance->Users->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible");
+ Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
virtual ~ModuleInvisible()
{
ServerInstance->Modes->DelMode(qm);
ServerInstance->Modes->DelModeWatcher(ido);
- DELETE(qm);
- DELETE(ido);
- DELETE(conf);
+ delete qm;
+ delete ido;
+ delete conf;
}
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)
- {
- List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
- }
- virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+ virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
{
if (user->IsModeSet('Q'))
{
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);
- ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name);
+ this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
+ ServerInstance->SNO->WriteToSnoMask('A', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name);
}
}
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
- DELETE(conf);
+ delete conf;
conf = new ConfigReader(ServerInstance);
}
- 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 (user->IsModeSet('Q'))
{
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,
+ this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name,
partmessage.empty() ? "" : " :",
partmessage.empty() ? "" : partmessage.c_str());
}
}
- 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)
{
if (user->IsModeSet('Q'))
{
- 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)
}
}
}
-};
-class ModuleInvisibleFactory : public ModuleFactory
-{
- public:
- ModuleInvisibleFactory()
+ /* No privmsg response when hiding - submitted by Eric at neowin */
+ virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
+ if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
+ {
+ User* target = (User*)dest;
+ if(target->IsModeSet('Q') && !*user->oper)
+ {
+ user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, target->nick);
+ return 1;
+ }
+ }
+ return 0;
}
- ~ModuleInvisibleFactory()
+ virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
+ return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
}
-
- virtual Module * CreateModule(InspIRCd* Me)
+
+ /* Fix by Eric @ neowin.net, thanks :) -- Brain */
+ void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4,5)
{
- return new ModuleInvisible(Me);
- }
+ va_list argsPtr;
+ char textbuffer[MAXBUF];
+ char tb[MAXBUF];
-};
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(argsPtr);
+ snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer);
+
+ CUList *ulist = channel->GetUsers();
+
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ {
+ /* User only appears to vanish for non-opers */
+ if (IS_LOCAL(i->first) && IS_OPER(i->first))
+ {
+ i->first->Write(std::string(tb));
+ }
+ }
+ }
-extern "C" void * init_module( void )
-{
- return new ModuleInvisibleFactory;
-}
+};
+MODULE_INIT(ModuleInvisible)
projects / user / henk / code / inspircd.git / blobdiff