Tidy up source files:

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

diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 98e1c45b62fc422253966742c23af2e149c12609..e92eea3a5c02ef434ef22eb895c6955c61a2c64d 100644 (file)
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -18,10 +18,10 @@
 
 
 #include "inspircd.h"
-#include "sql.h"
-#include "hash.h"
+#include "modules/sql.h"
+#include "modules/hash.h"
 
-/* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
+/* $ModDesc: Allow/Deny connections based upon an arbitrary SQL table */
 
 enum AuthState {
        AUTH_STATE_NONE = 0,
@@ -39,7 +39,7 @@ class AuthQuery : public SQLQuery
                : SQLQuery(me), uid(u), pendingExt(e), verbose(v)
        {
        }
-       
+
        void OnResult(SQLResult& res)
        {
                User* user = ServerInstance->FindNick(uid);
@@ -52,7 +52,7 @@ class AuthQuery : public SQLQuery
                else
                {
                        if (verbose)
-                               ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s!%s@%s (SQL query returned no matches)", user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (SQL query returned no matches)", user->GetFullRealHost().c_str());
                        pendingExt.set(user, AUTH_STATE_FAIL);
                }
        }
@@ -64,7 +64,7 @@ class AuthQuery : public SQLQuery
                        return;
                pendingExt.set(user, AUTH_STATE_FAIL);
                if (verbose)
-                       ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s!%s@%s (SQL query failed: %s)", user->nick.c_str(), user->ident.c_str(), user->host.c_str(), error.Str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (SQL query failed: %s)", user->GetFullRealHost().c_str(), error.Str());
        }
 };
 
@@ -87,8 +87,8 @@ class ModuleSQLAuth : public Module
        {
                ServerInstance->Modules->AddService(pendingExt);
                OnRehash(NULL);
-               Implementation eventlist[] = { I_OnUserDisconnect, I_OnCheckReady, I_OnRehash, I_OnUserRegister };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = { I_OnCheckReady, I_OnRehash, I_OnUserRegister };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        void OnRehash(User* user)
@@ -120,8 +120,7 @@ class ModuleSQLAuth : public Module
 
                if (!SQL)
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', "Forbiding connection from %s!%s@%s (SQL database not present)",
-                               user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "Forbiding connection from %s (SQL database not present)", user->GetFullRealHost().c_str());
                        ServerInstance->Users->QuitUser(user, killreason);
                        return MOD_RES_PASSTHRU;
                }
@@ -162,7 +161,7 @@ class ModuleSQLAuth : public Module
 
        Version GetVersion()
        {
-               return Version("Allow/Deny connections based upon an arbitary SQL table", VF_VENDOR);
+               return Version("Allow/Deny connections based upon an arbitrary SQL table", VF_VENDOR);
        }
 };