X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermodes.cpp;h=fea793c0416b66f24bb6c44e4529b1366adb63a4;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=a8aa615cf0f5cab47eb19149c3599eeb7dedc6c7;hpb=c5c4ed7ed13b4322fd647590e615ef0aeb5033e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index a8aa615cf..fea793c04 100644
--- 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)