X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=6ee841301d1dd61baa574227e5a6a932490af8a0;hb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;hp=266d06350b48b905fde9dc2696ef63ee313e68d1;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/mode.cpp b/src/mode.cpp
index 266d06350..6ee841301 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *	              	 E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *		      	 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.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -24,7 +24,6 @@ using namespace std;
 #include "connection.h"
 #include "users.h"
 #include "modules.h"
-#include "message.h"
 #include "inspstring.h"
 #include "helperfuncs.h"
 #include "commands.h"
@@ -66,16 +65,8 @@ using namespace std;
 /* +n (notice mask - our implementation of snomasks) */
 #include "modes/umode_n.h"
 
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-
-extern InspIRCd* ServerInstance;
-
-extern time_t TIME;
-
-ModeHandler::ModeHandler(char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly)
-	: mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly)
+ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly)
+	: ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly)
 {
 }
 
@@ -134,7 +125,7 @@ bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &
 	return (ours < theirs);
 }
 
-ModeWatcher::ModeWatcher(char modeletter, ModeType type) : mode(modeletter), m_type(type)
+ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type)
 {
 }
 
@@ -309,7 +300,7 @@ void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool
 			 * (e.g. are they a (half)op?
 			 */
 
-			if ((IS_LOCAL(user)) && (cstatus(user, targetchannel) < STATUS_HOP))
+			if ((IS_LOCAL(user)) && (targetchannel->GetStatus(user) < STATUS_HOP))
 			{
 				/* We don't have halfop */
 				log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
@@ -666,7 +657,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw)
 	return true;
 }
 
-ModeParser::ModeParser()
+ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	/* Clear mode list */
 	memset(modehandlers, 0, sizeof(modehandlers));
@@ -675,28 +666,52 @@ ModeParser::ModeParser()
 	/* Initialise the RFC mode letters */
 
 	/* Start with channel simple modes, no params */
-	this->AddMode(new ModeChannelSecret, 's');
-	this->AddMode(new ModeChannelPrivate, 'p');
-	this->AddMode(new ModeChannelModerated, 'm');
-	this->AddMode(new ModeChannelTopicOps, 't');
-	this->AddMode(new ModeChannelNoExternal, 'n');
-	this->AddMode(new ModeChannelInviteOnly, 'i');
+	this->AddMode(new ModeChannelSecret(Instance), 's');
+	this->AddMode(new ModeChannelPrivate(Instance), 'p');
+	this->AddMode(new ModeChannelModerated(Instance), 'm');
+	this->AddMode(new ModeChannelTopicOps(Instance), 't');
+	this->AddMode(new ModeChannelNoExternal(Instance), 'n');
+	this->AddMode(new ModeChannelInviteOnly(Instance), 'i');
 
 	/* Cannel modes with params */
-	this->AddMode(new ModeChannelKey, 'k');
-	this->AddMode(new ModeChannelLimit, 'l');
+	this->AddMode(new ModeChannelKey(Instance), 'k');
+	this->AddMode(new ModeChannelLimit(Instance), 'l');
 
 	/* Channel listmodes */
-	this->AddMode(new ModeChannelBan, 'b');
-	this->AddMode(new ModeChannelOp, 'o');
-	this->AddMode(new ModeChannelHalfOp, 'h');
-	this->AddMode(new ModeChannelVoice, 'v');
+	this->AddMode(new ModeChannelBan(Instance), 'b');
+	this->AddMode(new ModeChannelOp(Instance), 'o');
+	this->AddMode(new ModeChannelHalfOp(Instance), 'h');
+	this->AddMode(new ModeChannelVoice(Instance), 'v');
 
 	/* Now for usermodes */
-	this->AddMode(new ModeUserServerNotice, 's');
-	this->AddMode(new ModeUserWallops, 'w');
-	this->AddMode(new ModeUserInvisible, 'i');
-	this->AddMode(new ModeUserOperator, 'o');
-	this->AddMode(new ModeUserServerNoticeMask, 'n');
+	this->AddMode(new ModeUserServerNotice(Instance), 's');
+	this->AddMode(new ModeUserWallops(Instance), 'w');
+	this->AddMode(new ModeUserInvisible(Instance), 'i');
+	this->AddMode(new ModeUserOperator(Instance), 'o');
+	this->AddMode(new ModeUserServerNoticeMask(Instance), 'n');
+}
+
+bool ModeParser::InsertMode(std::string &output, const char* mode, unsigned short section)
+{
+	unsigned short currsection = 1;
+	unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES="
+
+	if(section > 4 || section == 0)
+	{
+		log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section);
+		return false;
+	}
+
+	for(; pos < output.size(); pos++)
+	{
+		if(section == currsection)
+			break;
+
+		if(output[pos] == ',')
+			currsection++;
+	}
+
+	output.insert(pos, mode);
+	return true;
 }