Fix some indenting.

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

diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index ed294729f2cc8c8b16ac3d50eab5672244d7bfce..db68e749f5ebf58c5b09e8fefaae5126257522cf 100644 (file)
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -82,12 +82,13 @@ public:
                
                if (!CheckCredentials(user))
                {
-                       User::QuitUser(ServerInstance,user,killreason);
+                       ServerInstance->Users->QuitUser(user, killreason);
                        return 1;
                }
                return 0;
        }
-        void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
+
+       void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
        {
                std::string::size_type x = newline.find(find);
                while (x != std::string::npos)
@@ -99,7 +100,6 @@ public:
                }
        }
 
-
        bool CheckCredentials(User* user)
        {
                std::string thisquery = freeformquery;
@@ -110,7 +110,7 @@ public:
                SearchAndReplace(safepass, "\"", "");
 
                SearchAndReplace(thisquery, "$nick", user->nick);
-               SearchAndReplace(thisquery, "$pass", user->password);
+               SearchAndReplace(thisquery, "$pass", safepass);
                SearchAndReplace(thisquery, "$host", user->host);
                SearchAndReplace(thisquery, "$ip", user->GetIPString());
 
@@ -192,7 +192,7 @@ public:
 
                        if (!user->GetExt("sqlauthed"))
                        {
-                               User::QuitUser(ServerInstance,user,killreason);
+                               ServerInstance->Users->QuitUser(user, killreason);
                        }
                        return SQLSUCCESS;
                }