X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=6d5941f7e7ea5042eaa1d795e593b552c3c2d0cd;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=a786c60cbfb61a71601043de942ae244f1cb7053;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/message.cpp b/src/message.cpp
index a786c60cb..6d5941f7e 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -46,91 +46,7 @@ extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern ServerConfig* Config;
-
-/* return 0 or 1 depending if users u and u2 share one or more common channels
- * (used by QUIT, NICK etc which arent channel specific notices)
- *
- * The old algorithm in 1.0 for this was relatively inefficient, iterating over
- * the first users channels then the second users channels within the outer loop,
- * therefore it was a maximum of x*y iterations (upon returning 0 and checking
- * all possible iterations). However this new function instead checks against the
- * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
- * and saves us time as we already know what pointer value we are after.
- * Don't quote me on the maths as i am not a mathematician or computer scientist,
- * but i believe this algorithm is now x+(log y) maximum iterations instead.
- */
-int common_channels(userrec *u, userrec *u2)
-{
-	if ((!u) || (!u2) || (u->registered != REG_ALL) || (u2->registered != REG_ALL))
-		return 0;
-
-	/* Outer loop */
-	for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
-	{
-		/* Fetch the channel from the user */
-		ucrec* user_channel = *i;
-
-		if (user_channel->channel)
-		{
-			/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
-			 * by replacing it with a map::find which *should* be more efficient
-			 */
-			if (user_channel->channel->HasUser(u2))
-				return 1;
-		}
-	}
-	return 0;
-}
-
-void Blocking(int s)
-{
-	int flags = fcntl(s, F_GETFL, 0);
-	fcntl(s, F_SETFL, flags ^ O_NONBLOCK);
-}
-
-void NonBlocking(int s)
-{
-	int flags = fcntl(s, F_GETFL, 0);
-	fcntl(s, F_SETFL, flags | O_NONBLOCK);
-}
-
-int c_count(userrec* u)
-{
-	int z = 0;
-	for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
-		if ((*i)->channel)
-			z++;
-	return z;
-
-}
-
-void ChangeName(userrec* user, const char* gecos)
-{
-	if (user->fd > -1)
-	{
-		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(user,gecos));
-		if (MOD_RESULT)
-			return;
-		FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos));
-	}
-	strlcpy(user->fullname,gecos,MAXGECOS+1);
-}
-
-void ChangeDisplayedHost(userrec* user, const char* host)
-{
-	if (user->fd > -1)
-	{
-		int MOD_RESULT = 0;
-		FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host));
-		if (MOD_RESULT)
-			return;
-		FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host));
-	}
-	strlcpy(user->dhost,host,63);
-	user->WriteServ("396 %s %s :is now your hidden host",user->nick,user->dhost);
-}
+extern InspIRCd* ServerInstance;
 
 /* verify that a user's ident and nickname is valid */
 
@@ -267,28 +183,3 @@ int cstatus(userrec *user, chanrec *chan)
 	return STATUS_NORMAL;
 }
 
-std::string chlist(userrec *user,userrec* source)
-{
-	std::string list;
-	
-	if (!user || !source)
-		return "";
-	
-	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
-	{
-		ucrec* rec = *i;
-		
-		if(rec->channel && rec->channel->name)
-		{	
-			/* If the target is the same as the sender, let them see all their channels.
-			 * If the channel is NOT private/secret OR the user shares a common channel
-			 * If the user is an oper, and the <options:operspywhois> option is set.
-			 */
-			if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source))))
-			{
-				list.append(cmode(user, rec->channel)).append(rec->channel->name).append(" ");
-			}
-		}
-	}
-	return list;
-}