Dont echo the JOIN to the user whos speaking

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

diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 8832596f63161292540d049a4f4130b11269956a..c7fa0a6424bf43c509f6ed59dda9a4555bca5013 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include <string>
-
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
@@ -50,7 +45,7 @@ class ModuleOperLevels : public Module
                        List[I_OnRehash] = List[I_OnKill] = 1;
                }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user, const std::string &parameter)
                {
                        DELETE(conf);
                        conf = new ConfigReader(ServerInstance);
@@ -61,7 +56,7 @@ class ModuleOperLevels : public Module
                        return Version(1,1,0,1,VF_VENDOR,API_VERSION);
                }
 
-               virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
+               virtual int OnKill(User* source, User* dest, const std::string &reason)
                {
                        long dest_level = 0,source_level = 0;
 
@@ -90,7 +85,7 @@ class ModuleOperLevels : public Module
                                {
                                        ServerInstance->WriteOpers("Oper %s (level %d) attempted to /kill a higher oper: %s (level %d): Reason: %s",source->nick,source_level,dest->nick,dest_level,reason.c_str());
                                        dest->WriteServ("NOTICE %s :Oper %s attempted to /kill you!",dest->nick,source->nick);
-                                       source->WriteServ("481 %s :Permission Denied- Oper %s is a higher level than you",source->nick,dest->nick);
+                                       source->WriteServ("481 %s :Permission Denied - Oper %s is a higher level than you",source->nick,dest->nick);
                                        return 1;
                                }
                        }
@@ -99,26 +94,5 @@ class ModuleOperLevels : public Module
 
 };
 
-class ModuleOperLevelsFactory : public ModuleFactory
-{
- public:
-       ModuleOperLevelsFactory()
-       {
-       }
-
-       ~ModuleOperLevelsFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOperLevels(Me);
-       }
-
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleOperLevelsFactory;
-}
+MODULE_INIT(ModuleOperLevels)