fixed some indentation and spacing in modules

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

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index ad24fa0d88fe9a5482b32791ecb84997075eb59e..96130d039c32d2c2b6f42b665c942acfaf03d4d4 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
-class SaslAuthenticator
+class SaslAuthenticator : public classbase
 {
  private:
        InspIRCd *ServerInstance;
@@ -48,8 +48,7 @@ class SaslAuthenticator
                params.push_back("S");
                params.push_back(method);
 
-               Event e((char*)&params, Creator, "send_encap");
-               e.Send(ServerInstance);
+               ServerInstance->PI->SendEncapsulatedData(params);
        }
 
        SaslResult GetSaslResult(std::string &result_)
@@ -102,7 +101,7 @@ class SaslAuthenticator
                this->result = SASL_ABORT;
        }
 
-       bool SendClientMessage(const char* const* parameters, int pcnt)
+       bool SendClientMessage(const std::vector<std::string>& parameters)
        {
                if (this->state != SASL_COMM)
                        return true;
@@ -114,13 +113,11 @@ class SaslAuthenticator
                params.push_back(this->agent);
                params.push_back("C");
 
-               for (int i = 0; i < pcnt; ++i)
-                       params.push_back(parameters[i]);                
+               params.insert(params.end(), parameters.begin(), parameters.end());
 
-               Event e((char*)&params, Creator, "send_encap");
-               e.Send(ServerInstance);
+               ServerInstance->PI->SendEncapsulatedData(params);
 
-               if (*parameters[0] == '*')
+               if (parameters[0][0] == '*')
                {
                        this->Abort();
                        return false;
@@ -137,13 +134,13 @@ class SaslAuthenticator
                switch (this->result)
                {
                 case SASL_OK:
-                       this->user->WriteServ("903 %s :SASL authentication successful", this->user->nick);
+                       this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str());
                        break;
                 case SASL_ABORT:
-                       this->user->WriteServ("906 %s :SASL authentication aborted", this->user->nick);
+                       this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str());
                        break;
                 case SASL_FAIL:
-                       this->user->WriteServ("904 %s :SASL authentication failed", this->user->nick);
+                       this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick.c_str());
                        break;
                 default:
                        break;
@@ -168,7 +165,7 @@ class CommandAuthenticate : public Command
                this->source = "m_sasl.so";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                /* Only allow AUTHENTICATE on unregistered clients */
                if (user->registered != REG_ALL)
@@ -179,7 +176,7 @@ class CommandAuthenticate : public Command
                        SaslAuthenticator *sasl;
                        if (!(user->GetExt("sasl_authenticator", sasl)))
                                sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator);
-                       else if (sasl->SendClientMessage(parameters, pcnt) == false)    // IAL abort extension --nenolod
+                       else if (sasl->SendClientMessage(parameters) == false)  // IAL abort extension --nenolod
                                delete sasl;
                }
                return CMD_FAILURE;
@@ -191,7 +188,7 @@ class ModuleSASL : public Module
 {
        CommandAuthenticate* sasl;
  public:
-       
+
        ModuleSASL(InspIRCd* Me)
                : Module(Me)
        {
@@ -242,14 +239,8 @@ class ModuleSASL : public Module
                std::string* str = NULL;
 
                if (user->GetExt("accountname", str))
-               {
-                       std::deque<std::string> params;
-                       params.push_back(user->uuid);
-                       params.push_back("accountname");
-                       params.push_back(*str);
-                       Event e((char*)&params, this, "send_metadata");
-                       e.Send(ServerInstance);
-               }
+                       ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str);
+
                return;
        }