X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=2f47912aee76d0064972f9dae73599a925c60bfa;hb=7cfeb971666b3a6709fe61bd01478697e6433f50;hp=d772b4c6800a0f94724caec7c07b5558ef7948a6;hpb=714284aa306f2912eaca0c28d779d227db62a96b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index d772b4c68..2f47912ae 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -1,10 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 John Brooks <special@inspircd.org>
  *   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -61,8 +67,10 @@ class callerid_data
 		for (UserSet::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
 		{
 			User* u = *i;
-			// Encode UIDs.
-			oss << "," << (human ? u->nick : u->uuid);
+			if (human)
+				oss << ' ' << u->nick;
+			else
+				oss << ',' << u->uuid;
 		}
 		return oss.str();
 	}
@@ -196,7 +204,7 @@ public:
 		parameter = (action.second ? "" : "-") + action.first->uuid;
 	}
 
-	/** Will take any number of nicks (up to MaxTargets), which can be seperated by commas.
+	/** Will take any number of nicks (up to MaxTargets), which can be separated by commas.
 	 * - in front of any nick removes, and an * lists. This effectively means you can do:
 	 * /accept nick1,nick2,nick3,*
 	 * to add 3 nicks and then show your list
@@ -237,12 +245,12 @@ public:
 	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		// There is a list in parameters[0] in two cases:
-		// Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists,
+		// Either when the source is remote, this happens because 2.0 servers send comma separated uuid lists,
 		// we don't split those but broadcast them, as before.
 		//
 		// Or if the source is local then LoopCall() runs OnPostCommand() after each entry in the list,
 		// meaning the linking module has sent an ACCEPT already for each entry in the list to the
-		// appropiate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
+		// appropriate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
 		if ((!IS_LOCAL(user)) && (parameters[0].find(',') != std::string::npos))
 			return ROUTE_BROADCAST;
 
@@ -390,7 +398,7 @@ public:
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implementation of callerid, provides user mode +g and the ACCEPT command", VF_COMMON | VF_VENDOR);
+		return Version("Provides user mode g (bot) which allows users to require that other users are on their whitelist before messaging them.", VF_COMMON | VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE