Just to mess with om's head, remove helperfuncs.h from everywhere

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

diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index e0cba916011ac5aa4b24b7cb74a3408fd52aab82..22535e16349caed7a57902d656a98aa75ec3650c 100644 (file)
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -21,7 +21,7 @@
 #include "modules.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include "helperfuncs.h"
+
 #include "m_sqlv2.h"
 #include "m_sqlutils.h"
 #include "commands/cmd_oper.h"
@@ -42,11 +42,11 @@ public:
                
                if (SQLutils)
                {
-                       log(DEBUG, "Successfully got SQLutils pointer");
+                       ServerInstance->Log(DEBUG, "Successfully got SQLutils pointer");
                }
                else
                {
-                       log(DEFAULT, "ERROR: This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
+                       ServerInstance->Log(DEFAULT, "ERROR: This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
                        throw ModuleException("This module requires a module offering the 'SQLutils' feature (usually m_sqlutils.so). Please load it and try again.");
                }
                
@@ -100,7 +100,7 @@ public:
                                 * association. This means that if the user quits during a query we will just get a failed lookup from m_sqlutils - telling
                                 * us to discard the query.
                                 */
-                               log(DEBUG, "Sent query, got given ID %lu", req.id);
+                               ServerInstance->Log(DEBUG, "Sent query, got given ID %lu", req.id);
                                
                                AssociateUser(this, SQLutils, req.id, user).Send();
                                        
@@ -108,14 +108,14 @@ public:
                        }
                        else
                        {
-                               log(DEBUG, "SQLrequest failed: %s", req.error.Str());
+                               ServerInstance->Log(DEBUG, "SQLrequest failed: %s", req.error.Str());
                        
                                return false;
                        }
                }
                else
                {
-                       log(SPARSE, "WARNING: Couldn't find SQL provider module. NOBODY will be able to oper up unless their o:line is statically configured");
+                       ServerInstance->Log(SPARSE, "WARNING: Couldn't find SQL provider module. NOBODY will be able to oper up unless their o:line is statically configured");
                        return false;
                }
        }
@@ -128,7 +128,7 @@ public:
                
                        res = static_cast<SQLresult*>(request);
                        
-                       log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
+                       ServerInstance->Log(DEBUG, "Got SQL result (%s) with ID %lu", res->GetId(), res->id);
                        
                        userrec* user = GetAssocUser(this, SQLutils, res->id).S().user;
                        UnAssociate(this, SQLutils, res->id).S();
@@ -137,8 +137,8 @@ public:
                        {
                                if (res->error.Id() == NO_ERROR)
                                {                               
-                                       log(DEBUG, "Associated query ID %lu with user %s", res->id, user->nick);                        
-                                       log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
+                                       ServerInstance->Log(DEBUG, "Associated query ID %lu with user %s", res->id, user->nick);                        
+                                       ServerInstance->Log(DEBUG, "Got result with %d rows and %d columns", res->Rows(), res->Cols());
                        
                                        if (res->Rows())
                                        {
@@ -157,7 +157,7 @@ public:
                                                
                                                for (SQLfieldMap& row = res->GetRowMap(); row.size(); row = res->GetRowMap())
                                                {
-                                                       log(DEBUG, "Trying to oper user %s with username = '%s', passhash = '%s', hostname = '%s', type = '%s'", user->nick, row["username"].d.c_str(), row["password"].d.c_str(), row["hostname"].d.c_str(), row["type"].d.c_str());
+                                                       ServerInstance->Log(DEBUG, "Trying to oper user %s with username = '%s', passhash = '%s', hostname = '%s', type = '%s'", user->nick, row["username"].d.c_str(), row["password"].d.c_str(), row["hostname"].d.c_str(), row["type"].d.c_str());
                                                        
                                                        if (OperUser(user, row["username"].d, row["password"].d, row["hostname"].d, row["type"].d))
                                                        {
@@ -175,7 +175,7 @@ public:
                                                
                                                user->WriteServ( "491 %s :Invalid oper credentials", user->nick);
                                                Srv->WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s!", user->nick, user->ident, user->host);
-                                               log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
+                                               ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
                                        }
                                }
                                else
@@ -184,22 +184,22 @@ public:
                                         * We have to fail the /oper request and give them the same error
                                         * as above.
                                         */
-                                       log(DEBUG, "Query failed: %s", res->error.Str());
+                                       ServerInstance->Log(DEBUG, "Query failed: %s", res->error.Str());
 
                                        user->WriteServ( "491 %s :Invalid oper credentials", user->nick);
                                        Srv->WriteOpers("*** WARNING! Failed oper attempt by %s!%s@%s! (SQL query failed: %s)", user->nick, user->ident, user->host, res->error.Str());
-                                       log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
+                                       ServerInstance->Log(DEFAULT,"OPER: Failed oper attempt by %s!%s@%s: user, host or password did not match.", user->nick, user->ident, user->host);
                                }
                        }
                        else
                        {
-                               log(DEBUG, "Got query with unknown ID, this probably means the user quit while the query was in progress");
+                               ServerInstance->Log(DEBUG, "Got query with unknown ID, this probably means the user quit while the query was in progress");
                        }
                
                        return SQLSUCCESS;
                }
                
-               log(DEBUG, "Got unsupported API version string: %s", request->GetId());
+               ServerInstance->Log(DEBUG, "Got unsupported API version string: %s", request->GetId());
                
                return NULL;
        }       
@@ -212,7 +212,7 @@ public:
                {
                        std::string tname = Conf.ReadValue("type","name",j);
                        
-                       log(DEBUG, "Scanning opertype: %s", tname.c_str());
+                       ServerInstance->Log(DEBUG, "Scanning opertype: %s", tname.c_str());
                        
                        std::string hostname(user->ident);
                        hostname.append("@").append(user->host);
@@ -220,7 +220,7 @@ public:
                        if ((tname == type) && OneOfMatches(hostname.c_str(), user->GetIPString(), pattern.c_str()))
                        {
                                /* Opertype and host match, looks like this is it. */
-                               log(DEBUG, "Host (%s matched %s OR %s) and type (%s)", pattern.c_str(), hostname.c_str(), user->GetIPString(), type.c_str());
+                               ServerInstance->Log(DEBUG, "Host (%s matched %s OR %s) and type (%s)", pattern.c_str(), hostname.c_str(), user->GetIPString(), type.c_str());
                                
                                std::string operhost = Conf.ReadValue("type", "host", j);