All of insp now builds with -pedantic (theres some warnings to squash in modules...

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

diff --git a/src/modules/extra/m_httpclienttest.cpp b/src/modules/extra/m_httpclienttest.cpp
index 54ebe7e3b11b40eb4d847ac379379fd9d66a1a89..c5fe85a22f1dc0430067a92477ac8b1293af4d07 100644 (file)
--- a/src/modules/extra/m_httpclienttest.cpp
+++ b/src/modules/extra/m_httpclienttest.cpp
@@ -1,99 +1,81 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*     +------------------------------------+
+ *     | Inspire Internet Relay Chat Daemon |
+ *     +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "httpclient.h"
 
 /* $ModDep: httpclient.h */
 
 class MyModule : public Module
 {
-public:
-       MyModule(InspIRCd* Me)
-               : Module::Module(Me)
-       {
-       }
-
-       virtual ~MyModule()
-       {
-       }
-
-       virtual void Implements(char* List)
-       {
-               List[I_OnRequest] = List[I_OnUserJoin] = List[I_OnUserPart] = 1;
-       }
-
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_VENDOR,API_VERSION);
-       }
-
-       virtual void OnUserJoin(userrec* user, chanrec* channel)
-       {
-               // method called when a user joins a channel
-
-               std::string chan = channel->name;
-               std::string nick = user->nick;
-//               ServerInstance->Log(DEBUG,"User " + nick + " joined " + chan);
-
-                          Module* target = ServerInstance->FindModule("m_http_client.so");
-                          if(target) {
-                                  HTTPClientRequest req(ServerInstance, this, target, "http://znc.in/~psychon");
-                                  req.Send();
-                          }
-                          else
-                                  ServerInstance->Log(DEBUG,"module not found, load it!!");
-       }
-
-          char* OnRequest(Request* req)
-          {
-                  HTTPClientResponse* resp = (HTTPClientResponse*)req;
-                  if(!strcmp(resp->GetId(), HTTP_CLIENT_RESPONSE))
-                  {
-                         ServerInstance->Log(DEBUG, resp->GetData()); 
-                  }
-                  return NULL;
-          }
-
-       virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage)
-       {
-       }
 
-};
-
-class MyModuleFactory : public ModuleFactory
-{
 public:
-       MyModuleFactory()
-       {
-       }
 
-       ~MyModuleFactory()
-       {
-       }
+       MyModule(InspIRCd* Me)
+               : Module::Module(Me)
+       {
+       }
 
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new MyModule(Me);
-       }
+       virtual ~MyModule()
+       {
+       }
+
+       virtual void Implements(char* List)
+       {
+               List[I_OnRequest] = List[I_OnUserJoin] = List[I_OnUserPart] = 1;
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version(1,0,0,1,VF_VENDOR,API_VERSION);
+       }
+
+       virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+       {
+               // method called when a user joins a channel
+
+               std::string chan = channel->name;
+               std::string nick = user->nick;
+               ServerInstance->Log(DEBUG,"User " + nick + " joined " + chan);
+
+               Module* target = ServerInstance->Modules->Find("m_http_client.so");
+               if(target)
+               {
+                       HTTPClientRequest req(ServerInstance, this, target, "http://znc.in/~psychon");
+                       req.Send();
+               }
+               else
+                       ServerInstance->Log(DEBUG,"module not found, load it!!");
+       }
+
+       char* OnRequest(Request* req)
+       {
+               HTTPClientResponse* resp = (HTTPClientResponse*)req;
+               if(!strcmp(resp->GetId(), HTTP_CLIENT_RESPONSE))
+               {
+                       ServerInstance->Log(DEBUG, resp->GetData()); 
+               }
+               return NULL;
+       }
+
+       virtual void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+       {
+       }
 
 };
 
-extern "C" void * init_module( void )
-{
-       return new MyModuleFactory;
-}
+MODULE_INIT(MyModule)