Change to Duration for second param

[user/henk/code/inspircd.git] / src / modules / m_services_account.cpp

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index dea382452cc10ec3978fbcdc3b8bbe5462cceee6..58bacb7c8e7aa4ed7d664d0afbd7f574f3449358 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -22,7 +22,7 @@ class Channel_r : public ModeHandler
 {
 
  public:
-       Channel_r(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
+       Channel_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_CHANNEL) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -52,7 +52,7 @@ class User_r : public ModeHandler
 {
 
  public:
-       User_r(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'r', PARAM_NONE, MODETYPE_USER) { }
+       User_r(Module* Creator) : ModeHandler(Creator, "registered", 'r', PARAM_NONE, MODETYPE_USER) { }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
@@ -78,7 +78,7 @@ class User_r : public ModeHandler
 class AChannel_R : public SimpleChannelModeHandler
 {
  public:
-       AChannel_R(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'R') { }
+       AChannel_R(Module* Creator) : SimpleChannelModeHandler(Creator, "reginvite", 'R') { }
 };
 
 /** User mode +R - unidentified users cannot message
@@ -86,7 +86,7 @@ class AChannel_R : public SimpleChannelModeHandler
 class AUser_R : public SimpleUserModeHandler
 {
  public:
-       AUser_R(InspIRCd* Instance, Module* Creator) : SimpleUserModeHandler(Creator, 'R') { }
+       AUser_R(Module* Creator) : SimpleUserModeHandler(Creator, "regdeaf", 'R') { }
 };
 
 /** Channel mode +M - unidentified users cannot message channel
@@ -94,7 +94,7 @@ class AUser_R : public SimpleUserModeHandler
 class AChannel_M : public SimpleChannelModeHandler
 {
  public:
-       AChannel_M(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'M') { }
+       AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
 };
 
 class ModuleServicesAccount : public Module
@@ -104,10 +104,9 @@ class ModuleServicesAccount : public Module
        AUser_R m3;
        Channel_r m4;
        User_r m5;
-       StringExtItem accountname;
+       AccountExtItem accountname;
  public:
-       ModuleServicesAccount(InspIRCd* Me) : Module(Me),
-               m1(Me, this), m2(Me, this), m3(Me, this), m4(Me, this), m5(Me, this),
+       ModuleServicesAccount() : m1(this), m2(this), m3(this), m4(this), m5(this),
                accountname("accountname", this)
        {
 
@@ -116,9 +115,9 @@ class ModuleServicesAccount : public Module
                        !ServerInstance->Modes->AddMode(&m5))
                        throw ModuleException("Some other module has claimed our modes!");
 
-               Extensible::Register(&accountname);
+               ServerInstance->Extensions.Register(&accountname);
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin, I_OnCheckBan,
-                       I_OnSyncUser, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
+                       I_OnSyncUser, I_OnUserQuit, I_OnDecodeMetaData, I_On005Numeric, I_OnUserPostNick };
 
                ServerInstance->Modules->Attach(eventlist, this, 10);
        }
@@ -174,8 +173,10 @@ class ModuleServicesAccount : public Module
                if (target_type == TYPE_CHANNEL)
                {
                        Channel* c = (Channel*)dest;
+                       ModResult res;
+                       FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,c,"regmoderated"));
 
-                       if (c->IsModeSet('M') && !is_registered)
+                       if (c->IsModeSet('M') && !is_registered && res != MOD_RES_ALLOW)
                        {
                                // user messaging a +M channel and is not registered
                                user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
@@ -263,27 +264,18 @@ class ModuleServicesAccount : public Module
                                        dest->WriteNumeric(900, "%s %s %s :You are now logged in as %s",
                                                dest->nick.c_str(), dest->GetFullHost().c_str(), account->c_str(), account->c_str());
 
-                               AccountData ac;
-                               ac.user = dest;
-                               ac.account = *account;
-                               Event n((char*)&ac, this, "account_login");
-                               n.Send(ServerInstance);
+                               AccountEvent(this, dest, *account).Send();
                        }
                }
        }
 
        ~ModuleServicesAccount()
        {
-               ServerInstance->Modes->DelMode(&m1);
-               ServerInstance->Modes->DelMode(&m2);
-               ServerInstance->Modes->DelMode(&m3);
-               ServerInstance->Modes->DelMode(&m4);
-               ServerInstance->Modes->DelMode(&m5);
        }
 
        Version GetVersion()
        {
-               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_COMMON|VF_VENDOR);
        }
 };