X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=8e6627d1f5c8f35c5c0089c01c9ee3edce787668;hb=d49e33b22c2cbb22bad71fb07ce8003dec8270cf;hp=3591a2d89c54dcecabfb8f7d9fe70d02f3f316fb;hpb=10ef0fde2e1832f0684ae142a582cb5f032bfe6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 3591a2d89..8e6627d1f 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -30,6 +30,10 @@ static time_t LAST = 0;
  */
 void InspIRCd::Log(int level, const char* text, ...)
 {
+	/* sanity check, just in case */
+	if (!this->Config)
+		return;
+
 	/* Do this check again here so that we save pointless vsnprintf calls */
 	if ((level < Config->LogLevel) && !Config->forcedebug)
 		return;
@@ -46,6 +50,7 @@ void InspIRCd::Log(int level, const char* text, ...)
 
 void InspIRCd::Log(int level, const std::string &text)
 {
+	/* sanity check, just in case */
 	if (!this->Config)
 		return;
 
@@ -199,11 +204,12 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 				}
 			}
 			if (send_to_user)
-				t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
+			{
+				t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+			}
 		}
 	}
-	else
-	if (flags == WM_OR)
+	else if (flags == WM_OR)
 	{
 		for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 		{
@@ -218,14 +224,16 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
 					break;
 				}
 			}
+
 			if (send_to_user)
-				t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
+			{
+				t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+			}
 		}
 	}
 }
 
 /* Find a user record by nickname and return a pointer to it */
-
 userrec* InspIRCd::FindNick(const std::string &nick)
 {
 	user_hash::iterator iter = clientlist->find(nick);
@@ -248,7 +256,6 @@ userrec* InspIRCd::FindNick(const char* nick)
 }
 
 /* find a channel record by channel name and return a pointer to it */
-
 chanrec* InspIRCd::FindChan(const char* chan)
 {
 	chan_hash::iterator iter = chanlist->find(chan);
@@ -271,10 +278,7 @@ chanrec* InspIRCd::FindChan(const std::string &chan)
 	return iter->second;
 }
 
-/*
- * sends out an error notice to all connected clients (not to be used
- * lightly!)
- */
+/* Send an error notice to all users, registered or not */
 void InspIRCd::SendError(const std::string &s)
 {
 	for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
@@ -296,18 +300,19 @@ void InspIRCd::SendError(const std::string &s)
 	}
 }
 
-// this function counts all users connected, wether they are registered or NOT.
+/* this function counts all users connected, wether they are registered or NOT. */
 int InspIRCd::UserCount()
 {
 	return clientlist->size();
 }
 
-// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
+/* this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state */
 int InspIRCd::RegisteredUserCount()
 {
 	return clientlist->size() - this->UnregisteredUserCount();
 }
 
+/* return how many users have a given mode e.g. 'a' */
 int InspIRCd::ModeCount(const char mode)
 {
 	ModeHandler* mh = this->Modes->FindMode(mode, MODETYPE_USER);
@@ -318,32 +323,38 @@ int InspIRCd::ModeCount(const char mode)
 		return 0;
 }
 
+/* wrapper for readability */
 int InspIRCd::InvisibleUserCount()
 {
 	return ModeCount('i');
 }
 
+/* return how many users are opered */
 int InspIRCd::OperCount()
 {
 	return this->all_opers.size();
 }
 
+/* return how many users are unregistered */
 int InspIRCd::UnregisteredUserCount()
 {
 	return this->unregistered_count;
 }
 
+/* return channel count */
 long InspIRCd::ChannelCount()
 {
 	return chanlist->size();
 }
 
+/* return how many local registered users there are */
 long InspIRCd::LocalUserCount()
 {
 	/* Doesnt count unregistered clients */
 	return (local_users.size() - this->UnregisteredUserCount());
 }
-	
+
+/* true for valid channel name, false else */
 bool InspIRCd::IsChannel(const char *chname)
 {
 	char *c;
@@ -377,7 +388,8 @@ bool InspIRCd::IsChannel(const char *chname)
 	return true;
 }
 
-bool InspIRCd::IsNick(const char* n)
+/* true for valid nickname, false else */
+bool IsNickHandler::Call(const char* n)
 {
 	if (!n || !*n)
 		return false;
@@ -405,7 +417,7 @@ bool InspIRCd::IsNick(const char* n)
 	return (p < NICKMAX - 1);
 }
 
-
+/* return true for good ident, false else */
 bool InspIRCd::IsIdent(const char* n)
 {
 	if (!n || !*n)
@@ -429,6 +441,7 @@ bool InspIRCd::IsIdent(const char* n)
 	return true;
 }
 
+/* open the proper logfile */
 void InspIRCd::OpenLog(char** argv, int argc)
 {
 	Config->MyDir = Config->GetFullProgDir();
@@ -437,11 +450,7 @@ void InspIRCd::OpenLog(char** argv, int argc)
 	{
 		if (Config->logpath.empty())
 		{
-#ifndef DARWIN
 			Config->logpath = Config->MyDir + "/ircd.log";
-#else
-			Config->logpath = "/var/log/ircd.log";
-#endif
 		}
 
 		Config->log_file = fopen(Config->logpath.c_str(),"a+");
@@ -462,17 +471,10 @@ void InspIRCd::OpenLog(char** argv, int argc)
 
 void InspIRCd::CheckRoot()
 {
-#ifndef DARWIN
 	if (geteuid() == 0)
 	{
 		printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
 		this->Log(DEFAULT,"Cant start as root");
-#else
-	if (geteuid() != 16)
-	{
-		printf("WARNING!!! You are not running inspircd as the ircdaemon user!!! YOU CAN NOT DO THIS!!!\n\n");
-		this->Log(DEFAULT,"Must start as user ircdaemon");
-#endif
 		Exit(EXIT_STATUS_ROOT);
 	}
 }