Remove module file extensions from user-visible messages.

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

diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index f68bc471fc7452dc3b3d3c3baf99ad6369ad9c6a..c47ddb5b2fb8ae70b5d36d832f246e76b3bb4f9e 100644 (file)
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -1,43 +1,35 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "httpd.h"
-#include "protocol.h"
 
-/* $ModDesc: Provides statistics over HTTP via m_httpd.so */
-/* $ModDep: httpd.h */
+#include "inspircd.h"
+#include "modules/httpd.h"
 
-class ModuleHttpStats : public Module
+class ModuleHttpConfig : public Module, public HTTPRequestEventListener
 {
-
-       std::string stylesheet;
-       bool changed;
+       HTTPdAPI API;
 
  public:
-
-       void ReadConfig()
-       {
-               ConfigReader c(ServerInstance);
-               this->stylesheet = c.ReadValue("httpstats", "stylesheet", 0);
-       }
-
-       ModuleHttpStats(InspIRCd* Me) : Module(Me)
+       ModuleHttpConfig()
+               : HTTPRequestEventListener(this)
+               , API(this)
        {
-               ReadConfig();
-               this->changed = true;
-               Implementation eventlist[] = { I_OnEvent, I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        std::string Sanitize(const std::string &str)
@@ -74,14 +66,12 @@ class ModuleHttpStats : public Module
                return ret;
        }
 
-       void OnEvent(Event* event)
+       ModResult HandleRequest(HTTPRequest* http)
        {
                std::stringstream data("");
 
-               if (event->GetEventID() == "httpd_url")
                {
-                       ServerInstance->Logs->Log("m_http_stats", DEBUG,"Handling httpd event");
-                       HTTPRequest* http = (HTTPRequest*)event->GetData();
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Handling httpd event");
 
                        if ((http->GetURI() == "/config") || (http->GetURI() == "/config/"))
                        {
@@ -91,38 +81,35 @@ class ModuleHttpStats : public Module
                                for (ConfigDataHash::iterator x = ServerInstance->Config->config_data.begin(); x != ServerInstance->Config->config_data.end(); ++x)
                                {
                                        data << "&lt;" << x->first << " ";
-                                       for (KeyValList::iterator j = x->second.begin(); j != x->second.end(); j++)
+                                       const ConfigItems& items = x->second->getItems();
+                                       for (ConfigItems::const_iterator j = items.begin(); j != items.end(); j++)
                                        {
-                                               data << j->first << "=&quot;" << j->second << "&quot; ";
+                                               data << Sanitize(j->first) << "=&quot;" << Sanitize(j->second) << "&quot; ";
                                        }
                                        data << "&gt;<br>";
                                }
 
                                data << "</body></html>";
                                /* Send the document back to m_httpd */
-                               HTTPDocument response(http->sock, &data, 200);
-                               response.headers.SetHeader("X-Powered-By", "m_httpd_config.so");
+                               HTTPDocumentResponse response(this, *http, &data, 200);
+                               response.headers.SetHeader("X-Powered-By", MODNAME);
                                response.headers.SetHeader("Content-Type", "text/html");
-                               Request req((char*)&response, (Module*)this, event->GetSource());
-                               req.Send();
+                               API->SendResponse(response);
+                               return MOD_RES_DENY; // Handled
                        }
                }
+               return MOD_RES_PASSTHRU;
        }
 
-       const char* OnRequest(Request* request)
-       {
-               return NULL;
-       }
-
-
-       virtual ~ModuleHttpStats()
+       ModResult OnHTTPRequest(HTTPRequest& req) CXX11_OVERRIDE
        {
+               return HandleRequest(&req);
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Allows for the server configuration to be viewed over HTTP via m_httpd", VF_VENDOR);
        }
 };
 
-MODULE_INIT(ModuleHttpStats)
+MODULE_INIT(ModuleHttpConfig)