Added a tiny bit more logging to LoadModule, to log to default loglevel when a module...

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 3ee4d41132f4ef3f9ec66a9cdf5b93fc49445d7e..df4cfe7544366da52a0aa6270a6ae2619b2738c8 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -222,7 +222,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                        }
                        else
                        {
-                               printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-nolimit] [-notraceback] [-logfile <filename>]\n",argv[0]);
+                               printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile <filename>]\n",argv[0]);
                                Exit(ERROR);
                        }
                }
@@ -577,6 +577,10 @@ bool InspIRCd::LoadModule(const char* filename)
                                        snprintf(MODERR,MAXBUF,"Loader/Linker error: Incorrect module API version: %d (our version: %d)",v.API,API_VERSION);
                                        return false;
                                }
+                               else
+                               {
+                                       this->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+                               }
 
                                modules[this->ModCount+1] = m;
                                /* save the module and the module's classfactory, if
@@ -664,7 +668,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                        WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
                if ((TIME % 3600) == 0)
                {
-                       irc::whowas::MaintainWhoWas(TIME);
+                       irc::whowas::MaintainWhoWas(this, TIME);
                }
                Timers->TickTimers(TIME);
                this->DoBackgroundUserStuff(TIME);
@@ -708,30 +712,6 @@ bool InspIRCd::IsIdent(const char* n)
 }
 
 
-bool InspIRCd::IsNick(const char* n)
-{
-       if (!n || !*n)
-               return false;
-
-       int p = 0; 
-       for (char* i = (char*)n; *i; i++, p++)
-       {
-               /* "A"-"}" can occur anywhere in a nickname */
-               if ((*i >= 'A') && (*i <= '}'))
-               {
-                       continue;
-               }
-               /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
-               if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
-               {
-                       continue;
-               }
-               /* invalid character! abort */
-               return false;
-       }
-       return (p < NICKMAX - 1);
-}
-
 int InspIRCd::Run()
 {
        while (true)