* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-#include "helperfuncs.h"
-#include "hashcomp.h"
#include "inspircd.h"
/* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
-
-
+/** Channel mode +R - unidentified users cannot join
+ */
class AChannel_R : public ModeHandler
{
public:
}
};
+/** User mode +R - unidentified users cannot message
+ */
class AUser_R : public ModeHandler
{
public:
}
};
+/** Channel mode +M - unidentified users cannot message channel
+ */
class AChannel_M : public ModeHandler
{
public:
{
if (channel->IsModeSet('M'))
{
- channel->SetMode('M',true);
+ channel->SetMode('M',false);
return MODEACTION_ALLOW;
}
}
AChannel_M* m2;
AUser_R* m3;
public:
- ModuleServicesAccount(InspIRCd* Me) : Module::Module(Me)
+ ModuleServicesAccount(InspIRCd* Me) : Module(Me)
{
m1 = new AChannel_R(ServerInstance);
m2 = new AChannel_M(ServerInstance);
m3 = new AUser_R(ServerInstance);
- ServerInstance->AddMode(m1, 'R');
- ServerInstance->AddMode(m2, 'M');
- ServerInstance->AddMode(m3, 'R');
- }
-
- virtual void On005Numeric(std::string &output)
- {
- ServerInstance->Modes->InsertMode(output, "RM", 4);
+ if (!ServerInstance->AddMode(m1, 'R') || !ServerInstance->AddMode(m2, 'M') || !ServerInstance->AddMode(m3, 'R'))
+ throw ModuleException("Could not add new modes!");
}
/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
if (account)
{
- source->WriteServ("330 %s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
+ ServerInstance->SendWhoisLine(source, dest, 330, "%s %s %s :is logged in as", source->nick, dest->nick, account->c_str());
}
}
void Implements(char* List)
{
- List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+ List[I_OnWhois] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
List[I_OnSyncUserMetaData] = List[I_OnUserQuit] = List[I_OnCleanup] = List[I_OnDecodeMetaData] = 1;
}
- virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
+ virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
std::string *account;
+
+ if (!IS_LOCAL(user))
+ return 0;
+
user->GetExt("accountname", account);
if (target_type == TYPE_CHANNEL)
if ((c->IsModeSet('M')) && (!account))
{
- if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)) || (!strcmp(user->server,"")))
+ if ((ServerInstance->ULine(user->nick)) || (ServerInstance->ULine(user->server)))
{
// user is ulined, can speak regardless
return 0;
return 0;
}
- virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
+ virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
- return OnUserPreMessage(user, dest, target_type, text, status);
+ return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
}
- virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+ virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
{
std::string *account;
user->GetExt("accountname", account);
// this method is called. We should use the ProtoSendMetaData function after we've
// corrected decided how the data should look, to send the metadata on its way if
// it is ours.
- virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
+ virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
{
// check if the linking module wants to know about OUR metadata
if (extname == "accountname")
user->GetExt("accountname", account);
if (account)
{
+ // remove any accidental leading/trailing spaces
+ trim(*account);
+
// call this function in the linking module, let it format the data how it
// sees fit, and send it on its way. We dont need or want to know how.
proto->ProtoSendMetaData(opaque,TYPE_USER,user,extname,*account);
}
// when a user quits, tidy up their metadata
- virtual void OnUserQuit(userrec* user, const std::string &message)
+ virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
{
std::string* account;
user->GetExt("accountname", account);
if ((target_type == TYPE_USER) && (extname == "accountname"))
{
userrec* dest = (userrec*)target;
+
/* logging them out? */
- if (extdata == "")
+ if (extdata.empty())
{
std::string* account;
dest->GetExt("accountname", account);
if (!dest->GetExt("accountname", text))
{
text = new std::string(extdata);
+ // remove any accidental leading/trailing spaces
+ trim(*text);
dest->Extend("accountname", text);
}
}
virtual ~ModuleServicesAccount()
{
- DELETE(m1);
- DELETE(m2);
- DELETE(m3);
+ ServerInstance->Modes->DelMode(m1);
+ ServerInstance->Modes->DelMode(m2);
+ ServerInstance->Modes->DelMode(m3);
+ delete m1;
+ delete m2;
+ delete m3;
}
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+ return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
}
};
-
-class ModuleServicesAccountFactory : public ModuleFactory
-{
- public:
- ModuleServicesAccountFactory()
- {
- }
-
- ~ModuleServicesAccountFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleServicesAccount(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleServicesAccountFactory;
-}
+MODULE_INIT(ModuleServicesAccount)
projects / user / henk / code / inspircd.git / blobdiff