X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_foobar.cpp;h=d9254c4359d38d385028a5a45f957a1b93a1bcce;hb=f00094febf62beb74fb45a765a9fccd1ba4c8b8b;hp=deb4c1229476cba297beaad70a806851bab7de6c;hpb=38ca8be9a3881a3cb3cf6864e67b779ffbab6874;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index deb4c1229..d9254c435 100644
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,10 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: A dummy module for testing */
@@ -34,11 +30,13 @@ class ModuleFoobar : public Module
 	 
  public:
 	ModuleFoobar(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		// The constructor just makes a copy of the server class
 	
 		
+		Implementation eventlist[] = { I_OnUserConnect, I_OnUserQuit, I_OnUserJoin, I_OnUserPart, I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 	
 	virtual ~ModuleFoobar()
@@ -50,82 +48,53 @@ class ModuleFoobar : public Module
 		// this method instantiates a class of type Version, and returns
 		// the modules version information using it.
 	
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserConnect] = List[I_OnUserQuit] = List[I_OnUserJoin] = List[I_OnUserPart] = 1;
-	}
 	
-	virtual void OnUserConnect(userrec* user)
+	virtual void OnUserConnect(User* user)
 	{
 		// method called when a user connects
 	
 		std::string b = user->nick;
-		ServerInstance->Log(DEBUG,"Foobar: User connecting: "+b);
+		ServerInstance->Logs->Log("m_foobar",DEBUG,"Foobar: User connecting: "+b);
 	}
 
-	virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+	virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
 	{
 		// method called when a user disconnects
 	
 		std::string b = user->nick;
-		ServerInstance->Log(DEBUG,"Foobar: User quitting: "+b);
+		ServerInstance->Logs->Log("m_foobar",DEBUG,"Foobar: User quitting: "+b);
 	}
 	
-	virtual void OnUserJoin(userrec* user, chanrec* channel)
+	virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
 	{
 		// method called when a user joins a channel
-	
+
 		std::string c = channel->name;
 		std::string b = user->nick;
-		ServerInstance->Log(DEBUG,"Foobar: User "+b+" joined "+c);
+		ServerInstance->Logs->Log("m_foobar",DEBUG,"Foobar: User "+b+" joined "+c);
 	}
 
-	virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason)
+	virtual void OnUserPart(User* user, Channel* channel, const std::string &partreason, bool &silent)
 	{
 		// method called when a user parts a channel
 	
 		std::string c = channel->name;
 		std::string b = user->nick;
-		ServerInstance->Log(DEBUG,"Foobar: User "+b+" parted "+c);
+		ServerInstance->Logs->Log("m_foobar",DEBUG,"Foobar: User "+b+" parted "+c);
 	}
 
-};
-
-
-//
-// The ModuleFoobarFactory class inherits from ModuleFactory
-// and creates a ModuleFoobar object when requested.
-//
-
-class ModuleFoobarFactory : public ModuleFactory
-{
- public:
-	ModuleFoobarFactory()
+	virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
 	{
+		if (chan->IsExtBanned(user, 'n'))
+			return 1;
+
+		return 0;
 	}
-	
-	~ModuleFoobarFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleFoobar(Me);
-	}
-	
 };
 
 
-//
-// The "C" linkage factory0() function creates the ModuleFoobarFactory
-// class for this library
-//
-
-extern "C" void * init_module( void )
-{
-	return new ModuleFoobarFactory;
-}
+MODULE_INIT(ModuleFoobar)