X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=cd173b55ffb1148fe22ab32013a957552815ab09;hb=37fd031da06761c8a050105b55d73a8ab499fb74;hp=50a3af61f4a542d0141b71e0015b1c5ba2aa9cec;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 50a3af61f..cd173b55f 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -17,11 +17,11 @@
 #include "xline.h"
 #include "exitcodes.h"
 
-std::string InspIRCd::GetServerDescription(const char* servername)
+std::string InspIRCd::GetServerDescription(const std::string& servername)
 {
 	std::string description;
 
-	FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
+	FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
 	if (!description.empty())
 	{
@@ -125,20 +125,16 @@ void InspIRCd::SendError(const std::string &s)
 {
 	for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
 	{
-		if ((*i)->registered == REG_ALL)
+		User* u = *i;
+		if (u->registered == REG_ALL)
 		{
-		   	(*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str());
+		   	u->WriteServ("NOTICE %s :%s",u->nick.c_str(),s.c_str());
 	   	}
 		else
 		{
 			/* Unregistered connections receive ERROR, not a NOTICE */
-			(*i)->Write("ERROR :" + s);
+			u->Write("ERROR :" + s);
 		}
-		/* This might generate a whole load of EAGAIN, but we dont really
-		 * care about this, as if we call SendError something catastrophic
-		 * has occured anyway, and we wont receive the events for these.
-		 */
-		(*i)->FlushWriteBuf();
 	}
 }
 
@@ -150,11 +146,11 @@ long InspIRCd::ChannelCount()
 
 bool InspIRCd::IsValidMask(const std::string &mask)
 {
-	char* dest = (char*)mask.c_str();
+	const char* dest = mask.c_str();
 	int exclamation = 0;
 	int atsign = 0;
 
-	for (char* i = dest; *i; i++)
+	for (const char* i = dest; *i; i++)
 	{
 		/* out of range character, bad mask */
 		if (*i < 32 || *i > 126)
@@ -285,20 +281,6 @@ bool InspIRCd::OpenLog(char**, int)
 	{
 		this->Logs->SetupNoFork();
 	}
-	Config->MyDir = Config->GetFullProgDir();
-
-	/* Attempt to find home directory, portable to windows */
-	const char* home = getenv("HOME");
-	if (!home)
-	{
-		/* No $HOME, log to %USERPROFILE% */
-		home = getenv("USERPROFILE");
-		if (!home)
-		{
-			/* Nothing could be found at all, log to current dir */
-			Config->logpath = "./startup.log";
-		}
-	}
 
 	if (!Config->writelog) return true; // Skip opening default log if -nolog
 
@@ -306,7 +288,7 @@ bool InspIRCd::OpenLog(char**, int)
 	{
 		if (Config->logpath.empty())
 		{
-			Config->logpath = "./startup.log";
+			Config->logpath = "logs/startup.log";
 		}
 
 		if (!Config->log_file)
@@ -322,8 +304,8 @@ bool InspIRCd::OpenLog(char**, int)
 		return false;
 	}
 
-	FileWriter* fw = new FileWriter(this, Config->log_file);
-	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
+	FileWriter* fw = new FileWriter(Config->log_file);
+	FileLogStream *f = new FileLogStream((Config->forcedebug ? DEBUG : DEFAULT), fw);
 
 	this->Logs->AddLogType("*", f, true);
 
@@ -340,24 +322,14 @@ void InspIRCd::CheckRoot()
 	}
 }
 
-void InspIRCd::CheckDie()
-{
-	if (*Config->DieValue)
-	{
-		printf("WARNING: %s\n\n",Config->DieValue);
-		this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
-		Exit(EXIT_STATUS_DIETAG);
-	}
-}
-
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
 {
 	std::string copy_text = text;
 
-	int MOD_RESULT = 0;
-	FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
 
-	if (!MOD_RESULT)
+	if (MOD_RESULT != MOD_RES_DENY)
 		user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
@@ -415,22 +387,21 @@ long InspIRCd::Duration(const std::string &str)
 	return total + subtotal;
 }
 
-bool InspIRCd::ULine(const char* sserver)
+bool InspIRCd::ULine(const std::string& sserver)
 {
-	if (!sserver)
-		return false;
-	if (!*sserver)
+	if (sserver.empty())
 		return true;
 
-	return (Config->ulines.find(sserver) != Config->ulines.end());
+	return (Config->ulines.find(sserver.c_str()) != Config->ulines.end());
 }
 
-bool InspIRCd::SilentULine(const char* sserver)
+bool InspIRCd::SilentULine(const std::string& sserver)
 {
-	std::map<irc::string,bool>::iterator n = Config->ulines.find(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;
+	else
+		return false;
 }
 
 std::string InspIRCd::TimeString(time_t curtime)