3rd time lucky? Fix again for setsockopt.

[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 73723f4e1bc886dc745a236089cf968da71cfe80..45baaf90e0fa834012a494f1a175d6b769740808 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(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(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(Module* Creator) : SimpleChannelModeHandler(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(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(Module* Creator) : SimpleChannelModeHandler(Creator, 'M') { }
+       AChannel_M(Module* Creator) : SimpleChannelModeHandler(Creator, "regmoderated", 'M') { }
 };
 
 class ModuleServicesAccount : public Module
@@ -117,7 +117,7 @@ class ModuleServicesAccount : public Module
 
                Extensible::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);
        }
@@ -262,11 +262,7 @@ 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();
+                               AccountEvent(this, dest, *account).Send();
                        }
                }
        }