Make User:: nick/ident/dhost/fullname and some other things std::string instead of...

[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..3ac333b37caebe99680e8dc2bbd37293c3a5407f 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -12,97 +12,32 @@
  */
 
 #include "inspircd.h"
+#include "account.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
+class AChannel_R : public SimpleChannelModeHandler
 {
  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, bool)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('R'))
-                       {
-                               channel->SetMode('R',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('R'))
-                       {
-                               channel->SetMode('R',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       AChannel_R(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'R') { }
 };
 
 /** User mode +R - unidentified users cannot message
  */
-class AUser_R : public ModeHandler
+class AUser_R : public SimpleUserModeHandler
 {
  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, bool)
-       {
-               if (adding)
-               {
-                       if (!dest->IsModeSet('R'))
-                       {
-                               dest->SetMode('R',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('R'))
-                       {
-                               dest->SetMode('R',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       AUser_R(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'R') { }
 };
 
 /** Channel mode +M - unidentified users cannot message channel
  */
-class AChannel_M : public ModeHandler
+class AChannel_M : public SimpleChannelModeHandler
 {
  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, bool)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('M'))
-                       {
-                               channel->SetMode('M',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('M'))
-                       {
-                               channel->SetMode('M',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       AChannel_M(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'M') { }
 };
 
 class ModuleServicesAccount : public Module
@@ -162,7 +97,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 +114,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;
                        }
                }
@@ -191,7 +126,7 @@ class ModuleServicesAccount : public Module
                return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
        }
         
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                std::string *account;
                user->GetExt("accountname", account);
@@ -208,7 +143,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 +239,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 +265,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);
        }
 };