X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=c9135679cfd0e8d6a31d4aeab4b484d1ee0685dd;hb=5ac5440a44595a7d7073a311bc280274aaed449e;hp=5cde46246f3acb7ca6b90995e316b424304540c4;hpb=8f34594cb7d600ccff100dff1817b69b03756ea2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 5cde46246..c9135679c 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -37,14 +37,7 @@ User* InspIRCd::FindNick(const std::string &nick)
 {
 	if (!nick.empty() && isdigit(*nick.begin()))
 		return FindUUID(nick);
-
-	user_hash::iterator iter = this->Users->clientlist.find(nick);
-
-	if (iter == this->Users->clientlist.end())
-		/* Couldn't find it */
-		return NULL;
-
-	return iter->second;
+	return FindNickOnly(nick);
 }
 
 User* InspIRCd::FindNickOnly(const std::string &nick)
@@ -79,25 +72,6 @@ Channel* InspIRCd::FindChan(const std::string &chan)
 	return iter->second;
 }
 
-/* Send an error notice to all users, registered or not */
-void InspIRCd::SendError(const std::string &s)
-{
-	const UserManager::LocalList& list = Users.GetLocalUsers();
-	for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
-	{
-		User* u = *i;
-		if (u->registered == REG_ALL)
-		{
-			u->WriteNotice(s);
-		}
-		else
-		{
-			/* Unregistered connections receive ERROR, not a NOTICE */
-			u->Write("ERROR :" + s);
-		}
-	}
-}
-
 bool InspIRCd::IsValidMask(const std::string &mask)
 {
 	const char* dest = mask.c_str();
@@ -153,7 +127,8 @@ void InspIRCd::StripColor(std::string &sentence)
 		else
 			seq = 0;
 
-		if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
+		// Strip all control codes too except \001 for CTCP
+		if (seq || ((*i >= 0) && (*i < 32) && (*i != 1)))
 			i = sentence.erase(i);
 		else
 			++i;