Add sanity checks to the ssl modules so that theres no possibility of an out of range...

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index a8aa615cf0f5cab47eb19149c3599eeb7dedc6c7..fea793c0416b66f24bb6c44e4529b1366adb63a4 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
@@ -65,14 +62,14 @@ class ModuleModesOnOper : public Module
                        if (!strcmp(typen.c_str(),user->oper))
                        {
                                std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-                               char first = *(ThisOpersModes.c_str());
-                               if ((first != '+') && (first != '-'))
-                                       ThisOpersModes = "+" + ThisOpersModes;
-                               if (ThisOpersModes != "")
+                               if (!ThisOpersModes.empty())
                                {
+                                       char first = *(ThisOpersModes.c_str());
+                                       if ((first != '+') && (first != '-'))
+                                               ThisOpersModes = "+" + ThisOpersModes;
+
                                        std::string buf;
                                        stringstream ss(ThisOpersModes);
-
                                        vector<string> tokens;
 
                                        // split ThisOperModes into modes and mode params
@@ -85,7 +82,7 @@ class ModuleModesOnOper : public Module
 
                                        // process mode params
                                        int i = 1;
-                                       for (unsigned int k = 1; k < tokens.size(); k++)
+                                       for (unsigned int k = 0; k < tokens.size(); k++)
                                        {
                                                modes[i] = tokens[k].c_str();
                                                i++;
@@ -106,29 +103,4 @@ class ModuleModesOnOper : public Module
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnOperFactory()
-       {
-       }
-       
-       ~ModuleModesOnOperFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleModesOnOper(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleModesOnOperFactory;
-}
-
+MODULE_INIT(ModuleModesOnOper)