Extbans can be VF_OPTCOMMON as they do not desync on module add/remove

[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..11a82901b9371642b61e4a677d0a167a0b060dea 100644 (file)
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,114 +11,51 @@
  * ---------------------------------------------------
  */
 
-#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. */
-
-
-
 class ModuleOperLevels : public Module
 {
-
-       private:
-
-               
-               ConfigReader* conf;
-
        public:
-
-               ModuleOperLevels(InspIRCd* Me)
-                       : Module(Me)
+               ModuleOperLevels()
                {
-
-                       
-                       conf = new ConfigReader(ServerInstance);
+                       Implementation eventlist[] = { I_OnRehash, I_OnKill };
+                       ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
                virtual ~ModuleOperLevels()
                {
-                       DELETE(conf);
                }
 
-               void Implements(char* List)
-               {
-                       List[I_OnRehash] = List[I_OnKill] = 1;
-               }
 
-               virtual void OnRehash(userrec* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
-                       DELETE(conf);
-                       conf = new ConfigReader(ServerInstance);
                }
 
                virtual Version GetVersion()
                {
-                       return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+                       return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR);
                }
 
-               virtual int OnKill(userrec* source, userrec* dest, const std::string &reason)
+               virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
                {
-                       long dest_level = 0,source_level = 0;
-
                        // oper killing an oper?
                        if (IS_OPER(dest) && IS_OPER(source))
                        {
-                               for (int j =0; j < conf->Enumerate("type"); j++)
-                               {
-                                       std::string typen = conf->ReadValue("type","name",j);
-                                       if (!strcmp(typen.c_str(),dest->oper))
-                                       {
-                                               dest_level = conf->ReadInteger("type","level",j,true);
-                                               break;
-                                       }
-                               }
-                               for (int k =0; k < conf->Enumerate("type"); k++)
-                               {
-                                       std::string typen = conf->ReadValue("type","name",k);
-                                       if (!strcmp(typen.c_str(),source->oper))
-                                       {
-                                               source_level = conf->ReadInteger("type","level",k,true);
-                                               break;
-                                       }
-                               }
+                               long dest_level = atol(dest->oper->getConfig("level").c_str());
+                               long source_level = atol(source->oper->getConfig("level").c_str());
                                if (dest_level > source_level)
                                {
-                                       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);
-                                       return 1;
+                                       if (IS_LOCAL(source)) ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %ld) attempted to /kill a higher oper: %s (level %ld): Reason: %s",source->nick.c_str(),source_level,dest->nick.c_str(),dest_level,reason.c_str());
+                                       dest->WriteServ("NOTICE %s :*** Oper %s attempted to /kill you!",dest->nick.c_str(),source->nick.c_str());
+                                       source->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper %s is a higher level than you",source->nick.c_str(),dest->nick.c_str());
+                                       return MOD_RES_DENY;
                                }
                        }
-                       return 0;
+                       return MOD_RES_PASSTHRU;
                }
 
 };
 
-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)