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 fe7f52f22c78ec2205996a80ea1fb5945e0d3bfd..8077007dc2f0cfcaecf8121a1c682704056e81cf 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -12,6 +12,7 @@
  */
 
 #include "inspircd.h"
+#include "account.h"
 
 /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
 
@@ -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);
        }
 };