X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=db2c246716620b16bf3480a5d03bc367c35e07fb;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=e5eefe0cf77357ec160443c9896615e5e2a2bbd5;hpb=28c82e83802100a2b7b6dadf5333a199c9fbe663;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index e5eefe0cf..db2c24671 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -14,10 +14,13 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
@@ -27,10 +30,10 @@ Server *Srv;
 class ModuleOperChans : public Module
 {
  public:
-	ModuleOperChans()
+	ModuleOperChans(Server* Me)
+		: Module::Module(Me)
 	{
-		Srv = new Server;
-
+		Srv = Me;
 		// Add a mode +O for channels with no parameters		
 		Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
 	}
@@ -74,7 +77,8 @@ class ModuleOperChans : public Module
                         }
                         temp2 = temp2 + temp1 + " ";
                 }
-                output = temp2.substr(0,temp2.length()-1);
+		if (temp2.length())
+	                output = temp2.substr(0,temp2.length()-1);
         }
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
@@ -95,18 +99,12 @@ class ModuleOperChans : public Module
 	
     	virtual ~ModuleOperChans()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
-	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
+		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
 	}
-
 };
 
 
@@ -121,9 +119,9 @@ class ModuleOperChansFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleOperChans;
+		return new ModuleOperChans(Me);
 	}
 	
 };