X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=d636e2d8958e20285291960e765ef8f55b836277;hb=90ab8cf4258a25e8403465ed86296fc74405620d;hp=1cadc49eba764cc398dc2d44f2b4615aa2b253a6;hpb=16398df07d4ce1f1d4a2e43d97bc39043f8d44b5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 1cadc49eb..d636e2d89 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -32,32 +32,15 @@
 #include "exitcodes.h"
 #include <iostream>
 
-std::string InspIRCd::GetServerDescription(const std::string& servername)
-{
-	std::string description;
-
-	FOREACH_MOD(OnGetServerDescription, (servername,description));
-
-	if (!description.empty())
-	{
-		return description;
-	}
-	else
-	{
-		// not a remote server that can be found, it must be me.
-		return Config->ServerDesc;
-	}
-}
-
 /* Find a user record by nickname and return a pointer to it */
 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);
+	user_hash::iterator iter = this->Users->clientlist.find(nick);
 
-	if (iter == this->Users->clientlist->end())
+	if (iter == this->Users->clientlist.end())
 		/* Couldn't find it */
 		return NULL;
 
@@ -66,9 +49,9 @@ User* InspIRCd::FindNick(const std::string &nick)
 
 User* InspIRCd::FindNickOnly(const std::string &nick)
 {
-	user_hash::iterator iter = this->Users->clientlist->find(nick);
+	user_hash::iterator iter = this->Users->clientlist.find(nick);
 
-	if (iter == this->Users->clientlist->end())
+	if (iter == this->Users->clientlist.end())
 		return NULL;
 
 	return iter->second;
@@ -76,9 +59,9 @@ User* InspIRCd::FindNickOnly(const std::string &nick)
 
 User *InspIRCd::FindUUID(const std::string &uid)
 {
-	user_hash::iterator finduuid = this->Users->uuidlist->find(uid);
+	user_hash::iterator finduuid = this->Users->uuidlist.find(uid);
 
-	if (finduuid == this->Users->uuidlist->end())
+	if (finduuid == this->Users->uuidlist.end())
 		return NULL;
 
 	return finduuid->second;
@@ -87,33 +70,15 @@ User *InspIRCd::FindUUID(const std::string &uid)
 
 Channel* InspIRCd::FindChan(const std::string &chan)
 {
-	chan_hash::iterator iter = chanlist->find(chan);
+	chan_hash::iterator iter = chanlist.find(chan);
 
-	if (iter == chanlist->end())
+	if (iter == chanlist.end())
 		/* Couldn't find it */
 		return NULL;
 
 	return iter->second;
 }
 
-/* Send an error notice to all users, registered or not */
-void InspIRCd::SendError(const std::string &s)
-{
-	for (LocalUserList::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.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();
@@ -329,24 +294,6 @@ void InspIRCd::CheckRoot()
 #endif
 }
 
-void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
-{
-	std::string copy_text = text;
-
-	ModResult MOD_RESULT;
-	FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
-
-	if (MOD_RESULT != MOD_RES_DENY)
-		user->WriteServ("%d %s", numeric, copy_text.c_str());
-}
-
-void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
-{
-	std::string textbuffer;
-	VAFORMAT(textbuffer, format, format)
-	this->SendWhoisLine(user, dest, numeric, textbuffer);
-}
-
 /** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array
  * lookups and pointer maths.
  */
@@ -400,15 +347,17 @@ const char* InspIRCd::Format(va_list &vaList, const char* formatString)
 		va_copy(dst, vaList);
 
 		int vsnret = vsnprintf(&formatBuffer[0], formatBuffer.size(), formatString, dst);
+		va_end(dst);
+
 		if (vsnret > 0 && static_cast<unsigned>(vsnret) < formatBuffer.size())
 		{
-			return &formatBuffer[0];
+			break;
 		}
 
 		formatBuffer.resize(formatBuffer.size() * 2);
 	}
 
-	throw CoreException();
+	return &formatBuffer[0];
 }
 
 const char* InspIRCd::Format(const char* formatString, ...)
@@ -418,31 +367,14 @@ const char* InspIRCd::Format(const char* formatString, ...)
 	return ret;
 }
 
-bool InspIRCd::ULine(const std::string& sserver)
-{
-	if (sserver.empty())
-		return true;
-
-	return (Config->ulines.find(sserver.c_str()) != Config->ulines.end());
-}
-
-bool InspIRCd::SilentULine(const std::string& sserver)
-{
-	std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver.c_str());
-	if (n != Config->ulines.end())
-		return n->second;
-	else
-		return false;
-}
-
-std::string InspIRCd::TimeString(time_t curtime)
+std::string InspIRCd::TimeString(time_t curtime, const char* format, bool utc)
 {
 #ifdef _WIN32
 	if (curtime < 0)
 		curtime = 0;
 #endif
 
-	struct tm* timeinfo = localtime(&curtime);
+	struct tm* timeinfo = utc ? gmtime(&curtime) : localtime(&curtime);
 	if (!timeinfo)
 	{
 		curtime = 0;
@@ -456,7 +388,15 @@ std::string InspIRCd::TimeString(time_t curtime)
 	else if (timeinfo->tm_year + 1900 < 1000)
 		timeinfo->tm_year = 0;
 
-	return std::string(asctime(timeinfo),24);
+	// This is the default format used by asctime without the terminating new line.
+	if (!format)
+		format = "%a %b %d %H:%M:%S %Y";
+
+	char buffer[512];
+	if (!strftime(buffer, sizeof(buffer), format, timeinfo))
+		buffer[0] = '\0';
+
+	return buffer;
 }
 
 std::string InspIRCd::GenRandomStr(int length, bool printable)
@@ -510,7 +450,7 @@ ModResult OnCheckExemptionHandler::Call(User* user, Channel* chan, const std::st
 		std::string::size_type pos = current.find(':');
 		if (pos == std::string::npos)
 			continue;
-		if (current.substr(0,pos) == restriction)
+		if (!current.compare(0, pos, restriction))
 			minmode = current[pos+1];
 	}