Everybody hates typos

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 9f6421fec925a982841fd3fd91282c47ac28e212..bb6e9227294434560b035a45626e17c69c565074 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -44,9 +44,7 @@ using namespace std;
 #include <sstream>
 #include <vector>
 #include <deque>
-#include "connection.h"
 #include "users.h"
-#include "servers.h"
 #include "ctables.h"
 #include "globals.h"
 #include "modules.h"
@@ -107,14 +105,14 @@ extern std::vector<std::string> module_names;
 
 extern int boundPortCount;
 extern int portCount;
-extern int SERVERportCount;
+
 extern int ports[MAXSOCKS];
-extern int defaultRoute;
 
-extern std::vector<long> auth_cookies;
+
+
 extern std::stringstream config_f;
 
-extern serverrec* me[32];
+
 
 extern FILE *log_file;
 
@@ -308,7 +306,7 @@ std::string Event::GetEventID()
                Module::Module() { }
                Module::~Module() { }
 void           Module::OnUserConnect(userrec* user) { }
-void           Module::OnUserQuit(userrec* user) { }
+void           Module::OnUserQuit(userrec* user, std::string message) { }
 void           Module::OnUserDisconnect(userrec* user) { }
 void           Module::OnUserJoin(userrec* user, chanrec* channel) { }
 void           Module::OnUserPart(userrec* user, chanrec* channel) { }
@@ -318,8 +316,9 @@ void                Module::OnRehash() { }
 void           Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int            Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) { return 0; }
 int            Module::OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params) { return false; }
+void           Module::OnMode(userrec* user, void* dest, int target_type, std::string text) { };
 Version                Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR); }
-void           Module::OnOper(userrec* user) { };
+void           Module::OnOper(userrec* user, std::string opertype) { };
 void           Module::OnInfo(userrec* user) { };
 void           Module::OnWhois(userrec* source, userrec* dest) { };
 int            Module::OnUserPreInvite(userrec* source,userrec* dest,chanrec* channel) { return 0; };
@@ -361,6 +360,8 @@ void                Module::OnRawSocketAccept(int fd, std::string ip, int localport) { };
 int            Module::OnRawSocketWrite(int fd, char* buffer, int count) { return 0; };
 void           Module::OnRawSocketClose(int fd) { };
 int            Module::OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult) { return 0; };
+void           Module::OnUserMessage(userrec* user, void* dest, int target_type, std::string text) { };
+void           Module::OnUserNotice(userrec* user, void* dest, int target_type, std::string text) { };
 
 // server is a wrapper class that provides methods to all of the C-style
 // exports in the core
@@ -379,6 +380,18 @@ void Server::AddSocket(InspSocket* sock)
        module_sockets.push_back(sock);
 }
 
+void Server::DelSocket(InspSocket* sock)
+{
+       for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+       {
+               if (*a == sock)
+               {
+                       module_sockets.erase(a);
+                       return;
+               }
+       }
+}
+
 void Server::SendOpers(std::string s)
 {
        WriteOpers("%s",s.c_str());