X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=bebb22007b9558f4a054e00f887c0dbb6873c0f2;hb=a5986ac2d317d148074522007007a6aac85baadb;hp=9ed77fb99332cfa7cd1046990bf37d408b74fbfe;hpb=b01dc3cb865c2faacfa69f6a081117bf349c6f40;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 9ed77fb99..bebb22007 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -22,8 +22,6 @@
  */
 
 
-/* $Core */
-
 #ifdef _WIN32
 #define _CRT_RAND_S
 #include <stdlib.h>
@@ -34,32 +32,15 @@
 #include "exitcodes.h"
 #include <iostream>
 
-std::string InspIRCd::GetServerDescription(const std::string& servername)
-{
-	std::string description;
-
-	FOREACH_MOD(I_OnGetServerDescription,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;
 
@@ -68,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;
@@ -78,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;
@@ -89,9 +70,9 @@ 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;
 
@@ -339,7 +320,7 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::str
 	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());
+		user->WriteNumeric(numeric, copy_text);
 }
 
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
@@ -402,15 +383,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, ...)
@@ -420,26 +403,28 @@ const char* InspIRCd::Format(const char* formatString, ...)
 	return ret;
 }
 
-bool InspIRCd::ULine(const std::string& sserver)
+std::string InspIRCd::TimeString(time_t curtime)
 {
-	if (sserver.empty())
-		return true;
+#ifdef _WIN32
+	if (curtime < 0)
+		curtime = 0;
+#endif
 
-	return (Config->ulines.find(sserver.c_str()) != Config->ulines.end());
-}
+	struct tm* timeinfo = localtime(&curtime);
+	if (!timeinfo)
+	{
+		curtime = 0;
+		timeinfo = localtime(&curtime);
+	}
 
-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;
-}
+	// If the calculated year exceeds four digits or is less than the year 1000,
+	// the behavior of asctime() is undefined
+	if (timeinfo->tm_year + 1900 > 9999)
+		timeinfo->tm_year = 9999 - 1900;
+	else if (timeinfo->tm_year + 1900 < 1000)
+		timeinfo->tm_year = 0;
 
-std::string InspIRCd::TimeString(time_t curtime)
-{
-	return std::string(ctime(&curtime),24);
+	return std::string(asctime(timeinfo),24);
 }
 
 std::string InspIRCd::GenRandomStr(int length, bool printable)
@@ -497,7 +482,7 @@ ModResult OnCheckExemptionHandler::Call(User* user, Channel* chan, const std::st
 			minmode = current[pos+1];
 	}
 
-	ModeHandler* mh = ServerInstance->Modes->FindMode(minmode, MODETYPE_CHANNEL);
+	PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(minmode);
 	if (mh && mypfx >= mh->GetPrefixRank())
 		return MOD_RES_ALLOW;
 	if (mh || minmode == '*')