X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_services.cpp;h=c868eefef6d687bf348ff03ae5d80449d4713d25;hb=9dd72b7003963d868a23da930a91300b49ab4959;hp=7eed797e93aae06d97de5438242eec6f418a6d3c;hpb=cfdb1b9f7ccc21fce1c06b53385126da8526c301;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 7eed797e9..c868eefef 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -29,6 +29,8 @@ using namespace std;
 class ModuleServices : public Module
 {
 	Server *Srv; 
+	bool kludgeme;
+
  public:
 	ModuleServices(Server* Me)
 		: Module::Module(Me)
@@ -40,30 +42,42 @@ class ModuleServices : public Module
 		Srv->AddExtendedMode('R',MT_CHANNEL,false,0,0);
 		Srv->AddExtendedMode('R',MT_CLIENT,false,0,0);
 		Srv->AddExtendedMode('M',MT_CHANNEL,false,0,0);
+
+		kludgeme = false;
 	}
 
-        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 + "rRM";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-		if (temp2.length())
-	                output = temp2.substr(0,temp2.length()-1);
-        }
+	virtual void On005Numeric(std::string &output)
+	{
+		InsertMode(output, "rRM", 4);
+	}
+
+	/* <- :stitch.chatspike.net 307 w00t w00t :is a registered nick */
+	virtual void OnWhois(userrec* source, userrec* dest)
+	{
+		if (dest->modes['r'-65])
+		{
+			/* user is registered */
+			WriteServ(source->fd, "307 %s %s :is a registered nick", source->nick, dest->nick);
+		}
+	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+		List[I_OnWhois] = List[I_OnUserPostNick] = List[I_OnUserPreMessage] = List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreJoin] = 1;
+	}
+
+	virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
+	{
+		/* On nickchange, if they have +r, remove it */
+		if (user->modes['r'-65])
+		{
+			char* modechange[2];
+			modechange[0] = user->nick;
+			modechange[1] = "-r";
+			kludgeme = true;
+			Srv->SendMode(modechange,2,user);
+			kludgeme = false;
+		}
 	}
 	
 	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
@@ -87,7 +101,7 @@ class ModuleServices : public Module
 			}
 			else
 			{
-				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"") || (strchr(user->nick,'.'))))
+				if ((kludgeme) || (Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"") || (strchr(user->nick,'.'))))
 				{
 					log(DEBUG,"Allowing umode +r, server and nick are: '%s','%s'",user->nick,user->server);
 					return 1;
@@ -114,12 +128,12 @@ class ModuleServices : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
 		if (target_type == TYPE_CHANNEL)
 		{
 			chanrec* c = (chanrec*)dest;
-			if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r')))
+			if ((c->IsModeSet('M')) && (!user->modes['r'-65]))
 			{
 				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
 				{
@@ -134,7 +148,7 @@ class ModuleServices : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
-			if ((strchr(u->modes,'R')) && (!strchr(user->modes,'r')))
+			if ((u->modes['R'-65]) && (user->modes['r'-65]))
 			{
 				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
 				{
@@ -149,48 +163,18 @@ class ModuleServices : public Module
 		return 0;
 	}
  	
-	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		if (target_type == TYPE_CHANNEL)
-		{
-			chanrec* c = (chanrec*)dest;
-			if ((c->IsCustomModeSet('M')) && (!strchr(user->modes,'r')))
-			{
-				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
-				{
-					// user is ulined, can speak regardless
-					return 0;
-				}
-				// user noticing a +M channel and is not registered
-				Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(c->name)+" :You need a registered nickname to speak on this channel");
-				return 1;
-			}
-		}
-		if (target_type == TYPE_USER)
-		{
-			userrec* u = (userrec*)dest;
-			if ((strchr(u->modes,'R')) && (!strchr(user->modes,'r')))
-			{
-				if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
-				{
-					// user is ulined, can speak regardless
-					return 0;
-				}
-				// user noticing a +R user and is not registered
-				Srv->SendServ(user->fd,"477 "+std::string(user->nick)+" "+std::string(u->nick)+" :You need a registered nickname to message this user");
-				return 1;
-			}
-		}
-		return 0;
+		return OnUserPreMessage(user,dest,target_type,text,status);
 	}
  	
 	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
 	{
 		if (chan)
 		{
-			if (chan->IsCustomModeSet('R'))
+			if (chan->IsModeSet('R'))
 			{
-				if (!strchr(user->modes,'r'))
+				if (user->modes['r'-65])
 				{
 					if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)))
 					{