X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=01b55f9cc7f027b503737943dd88d270b293ecae;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=db2c246716620b16bf3480a5d03bc367c35e07fb;hpb=2d821f2980825be73e3f90b47ffff365b0ec5ecb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index db2c24671..01b55f9cc 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -24,11 +24,9 @@ using namespace std;
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-Server *Srv;
-	 
-
 class ModuleOperChans : public Module
 {
+	Server* Srv;
  public:
 	ModuleOperChans(Server* Me)
 		: Module::Module(Me)
@@ -37,6 +35,11 @@ class ModuleOperChans : public Module
 		// Add a mode +O for channels with no parameters		
 		Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
 	}
+
+	void Implements(char* List)
+	{
+		List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+	}
 	
 	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
 	{
@@ -44,8 +47,9 @@ class ModuleOperChans : public Module
 		{
 			chanrec* chan = (chanrec*)target;
 			
-			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (strchr(user->modes,'o')))
+			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (*user->oper))
 			{
+				log(DEBUG,"Allowing mode +O");
 				return 1;
 			}
 			else
@@ -62,32 +66,18 @@ 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 void On005Numeric(std::string &output)
+	{
+		InsertMode(output,"O",4);
+	}
 	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
-		if (!strchr(user->modes,'o'))
+		if (!*user->oper)
 		{
 			if (chan)
 			{
-				if (chan->IsCustomModeSet('O'))
+				if (chan->IsModeSet('O'))
 				{
 					WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
 					return 1;