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

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

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 761ea2d9cf345425f703ceeea70f3b57af72a031..feddae0011990acd8d0ec00b61d0799d8d56af5f 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "httpd.h"
 
@@ -51,7 +51,7 @@ class HttpSocket : public InspSocket
 
        HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page)
        {
-               ilog(SI,DEBUG,"HttpSocket constructor");
+               SI->Log(DEBUG,"HttpSocket constructor");
                InternalState = HTTP_LISTEN;
        }
 
@@ -225,7 +225,7 @@ class HttpSocket : public InspSocket
                                                if (!claimed)
                                                {
                                                        SendHeaders(0, 404, "");
-                                                       ilog(Instance,DEBUG,"Page not claimed, 404");
+                                                       Instance->Log(DEBUG,"Page not claimed, 404");
                                                }
                                        }
                                }
@@ -245,7 +245,7 @@ class HttpSocket : public InspSocket
 
        void Page(std::stringstream* n, int response, std::string& extraheaders)
        {
-               ilog(Instance,DEBUG,"Sending page");
+               Instance->Log(DEBUG,"Sending page");
                SendHeaders(n->str().length(), response, extraheaders);
                this->Write(n->str());
        }
@@ -302,7 +302,7 @@ class ModuleHttp : public Module
 
        char* OnRequest(Request* request)
        {
-               log(DEBUG,"Got HTTPDocument object");
+               ServerInstance->Log(DEBUG,"Got HTTPDocument object");
                claimed = true;
                HTTPDocument* doc = (HTTPDocument*)request->GetData();
                HttpSocket* sock = (HttpSocket*)doc->sock;