Fix for bug #513

[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 a4f33c8eaf5cec1040a2e9db9c05bf5a9dbc8242..8077007dc2f0cfcaecf8121a1c682704056e81cf 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -2,7 +2,7 @@
  *       | 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
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "account.h"
 
 /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
 
@@ -22,7 +23,7 @@ class AChannel_R : public ModeHandler
  public:
        AChannel_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -52,7 +53,7 @@ class AUser_R : public ModeHandler
  public:
        AUser_R(InspIRCd* Instance) : ModeHandler(Instance, 'R', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -82,7 +83,7 @@ class AChannel_M : public ModeHandler
  public:
        AChannel_M(InspIRCd* Instance) : ModeHandler(Instance, 'M', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -118,7 +119,7 @@ class ModuleServicesAccount : public Module
                m1 = new AChannel_R(ServerInstance);
                m2 = new AChannel_M(ServerInstance);
                m3 = new AUser_R(ServerInstance);
-               if (!ServerInstance->AddMode(m1) || !ServerInstance->AddMode(m2) || !ServerInstance->AddMode(m3))
+               if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3))
                        throw ModuleException("Could not add new modes!");
 
                Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
@@ -162,7 +163,7 @@ class ModuleServicesAccount : public Module
                                }
 
                                // user messaging a +M channel and is not registered
-                               user->WriteServ("477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
+                               user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
                                return 1;
                        }
                }
@@ -179,7 +180,7 @@ class ModuleServicesAccount : public Module
                                }
 
                                // user messaging a +R user and is not registered
-                               user->WriteServ("477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
+                               user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(u->nick)+" :You need to be identified to a registered account to message this user");
                                return 1;
                        }
                }
@@ -208,7 +209,7 @@ class ModuleServicesAccount : public Module
                                                return 0;
                                        }
                                        // joining a +R channel and not identified
-                                       user->WriteServ("477 "+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
+                                       user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(chan->name)+" :You need to be identified to a registered account to join this channel");
                                        return 1;
                                }
                        }
@@ -304,6 +305,15 @@ class ModuleServicesAccount : public Module
                                        // remove any accidental leading/trailing spaces
                                        trim(*text);
                                        dest->Extend("accountname", text);
+
+                                       if (IS_LOCAL(dest))
+                                               dest->WriteNumeric(900, "%s %s %s :You are now logged in as %s", dest->nick, dest->GetFullHost(), text->c_str(), text->c_str());
+
+                                       AccountData ac;
+                                       ac.user = dest;
+                                       ac.account = *text;
+                                       Event n((char*)&ac, this, "account_login");
+                                       n.Send(ServerInstance);
                                }
                        }
                }
@@ -321,7 +331,7 @@ class ModuleServicesAccount : public Module
        
        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);
        }
 };