Really clever VOODOO.

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 3fce34c77b39aeab247038d1c95dafe50670ed9a..d96c068ed445e8693c63b45392d7dcaceb284a74 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -2,14 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                    E-mail:
- *             <brain@chatspike.net>
- *             <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -32,11 +29,15 @@ static time_t LAST = 0;
  */
 void InspIRCd::Log(int level, const char* text, ...)
 {
+       /* Do this check again here so that we save pointless vsnprintf calls */
+       if ((level < Config->LogLevel) && !Config->forcedebug)
+               return;
+
        va_list argsPtr;
-       char textbuffer[MAXBUF];
+       char textbuffer[65536];
 
        va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       vsnprintf(textbuffer, 65536, text, argsPtr);
        va_end(argsPtr);
 
        this->Log(level, std::string(textbuffer));
@@ -170,7 +171,7 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
        int modelen;
        va_list argsPtr;
 
-       if ((!text) || (!modes) || (!flags))
+       if (!text || !modes || !flags)
        {
                this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
                return;
@@ -181,14 +182,12 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
        va_end(argsPtr);
        modelen = strlen(modes);
 
-       for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+       if (flags == WM_AND)
        {
-               userrec* t = (userrec*)(*i);
-               bool send_to_user = false;
-
-               if (flags == WM_AND)
+               for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
                {
-                       send_to_user = true;
+                       userrec* t = *i;
+                       bool send_to_user = true;
 
                        for (int n = 0; n < modelen; n++)
                        {
@@ -198,10 +197,17 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
                                        break;
                                }
                        }
+                       if (send_to_user)
+                               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++)
                {
-                       send_to_user = false;
+                       userrec* t = *i;
+                       bool send_to_user = false;
 
                        for (int n = 0; n < modelen; n++)
                        {
@@ -211,11 +217,8 @@ void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
                                        break;
                                }
                        }
-               }
-
-               if (send_to_user)
-               {
-                       t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
+                       if (send_to_user)
+                               t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
                }
        }
 }
@@ -309,13 +312,7 @@ int InspIRCd::UserCount()
 int InspIRCd::RegisteredUserCount()
 {
        int c = 0;
-
-       for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-       {
-               c += (i->second->registered == REG_ALL);
-       }
-
-       return c;
+       return this->UnregisteredUserCount() - clientlist.size();
 }
 
 int InspIRCd::InvisibleUserCount()
@@ -444,26 +441,17 @@ void InspIRCd::OpenLog(char** argv, int argc)
                {
                        Config->logpath = ServerConfig::GetFullProgDir(argv,argc) + "/ircd.log";
                }
+
+               Config->log_file = fopen(Config->logpath.c_str(),"a+");
        }
        else
        {
                Config->log_file = fopen(this->LogFileName,"a+");
-
-               if (!Config->log_file)
-               {
-                       printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
-                       Exit(ERROR);
-               }
-
-               this->Logger = new FileLogger(this, Config->log_file);
-               return;
        }
 
-       Config->log_file = fopen(Config->logpath.c_str(),"a+");
-
        if (!Config->log_file)
        {
-               printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str());
+               printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
                Exit(ERROR);
        }
 
@@ -513,3 +501,25 @@ void InspIRCd::LoadAllModules()
        this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
 }
 
+void InspIRCd::SendWhoisLine(userrec* user, userrec* 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));
+
+       if (!MOD_RESULT)
+               user->WriteServ("%d %s", numeric, copy_text.c_str());
+}
+
+void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+       va_start (argsPtr, format);
+       vsnprintf(textbuffer, MAXBUF, format, argsPtr);
+       va_end(argsPtr);
+
+       this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
+}
+