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

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 461b7bece..db2c24671 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,8 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *           	  <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+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 */
 
@@ -12,12 +30,12 @@ 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('Z',MT_CHANNEL,false,0,0);
+		Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
 	}
 	
 	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
@@ -26,7 +44,7 @@ class ModuleOperChans : public Module
 		{
 			chanrec* chan = (chanrec*)target;
 			
-			if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")) || (strchr(source->modes,'o')))
+			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (strchr(user->modes,'o')))
 			{
 				return 1;
 			}
@@ -34,7 +52,7 @@ class ModuleOperChans : public Module
 			{
 				// eat the mode change, return an error
 				WriteServ(user->fd,"468 %s %s :Only servers and opers may set channel mode +O",user->nick, chan->name);
-				return -1;
+				return 0;
 			}
 	
 			// must return 1 to handle the mode!
@@ -43,6 +61,25 @@ class ModuleOperChans : public Module
 		
 		return 0;
 	}
+
+        virtual void On005Numeric(std::string &output)
+        {
+                std::stringstream line(output);
+                std::string temp1, temp2;
+                while (!line.eof())
+                {
+                        line >> temp1;
+                        if (temp1.substr(0,10) == "CHANMODES=")
+                        {
+                                // append the chanmode to the end
+                                temp1 = temp1.substr(10,temp1.length());
+                                temp1 = "CHANMODES=" + temp1 + "O";
+                        }
+                        temp2 = temp2 + temp1 + " ";
+                }
+		if (temp2.length())
+	                output = temp2.substr(0,temp2.length()-1);
+        }
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
@@ -62,18 +99,12 @@ class ModuleOperChans : public Module
 	
     	virtual ~ModuleOperChans()
 	{
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0);
+		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
 	}
-	
-	virtual void OnUserConnect(userrec* user)
-	{
-	}
-
 };
 
 
@@ -88,9 +119,9 @@ class ModuleOperChansFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleOperChans;
+		return new ModuleOperChans(Me);
 	}
 	
 };