Move AllModulesReportReady into a private method of class InspIRCd

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4851 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index 7a55e5d2365d14323fe30fa18aa1c93ef885f640..40df4c93c10e6eb6bc5cc3f0884aa9932a3ccb31 100644 (file)
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -51,7 +51,6 @@ enum DebugLevel
 void Error(int status);
 void ShowMOTD(userrec *user);
 void ShowRULES(userrec *user);
-bool AllModulesReportReady(userrec* user);
 bool IsValidChannelName(const char *);
 
 #endif

diff --git a/include/inspircd.h b/include/inspircd.h
index b2ed4da20240900a3fca00357fa54f8c71067f96..59dc7eab0972e332cac2ef641cf9fb4403968130 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -102,6 +102,8 @@ class InspIRCd : public classbase
        void DoSocketTimeouts(time_t TIME);
        void DoBackgroundUserStuff(time_t TIME);
 
+       bool AllModulesReportReady(userrec* user);
+
  public:
        time_t startup_time;
        ModeParser* ModeGrok;

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 71a8d24a0029b7a1bd1315ef4e2cabaf66c1c480..2c045c3ce9048d14a8f905eb88b6c5f7e85306aa 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -468,27 +468,6 @@ void ShowRULES(userrec *user)
        user->WriteServ("NOTICE %s :End of %s rules.",user->nick,ServerInstance->Config->ServerName);
 }
 
-// this returns 1 when all modules are satisfied that the user should be allowed onto the irc server
-// (until this returns true, a user will block in the waiting state, waiting to connect up to the
-// registration timeout maximum seconds)
-bool AllModulesReportReady(userrec* user)
-{
-       if (!ServerInstance->Config->global_implementation[I_OnCheckReady])
-               return true;
-
-       for (int i = 0; i <= MODCOUNT; i++)
-       {
-               if (ServerInstance->Config->implement_lists[i][I_OnCheckReady])
-               {
-                       int res = modules[i]->OnCheckReady(user);
-                       if (!res)
-                               return false;
-               }
-       }
-
-       return true;
-}
-
 bool IsValidChannelName(const char *chname)
 {
        char *c;

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6dad70a512dee17f585542e721fe7a96decf869c..758dd4757fceab1c2cb7d3489a38437e310cb302 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1024,3 +1024,26 @@ int main(int argc, char** argv)
        }
        return 0;
 }
+
+/* this returns true when all modules are satisfied that the user should be allowed onto the irc server
+ * (until this returns true, a user will block in the waiting state, waiting to connect up to the
+ * registration timeout maximum seconds)
+ */
+bool InspIRCd::AllModulesReportReady(userrec* user)
+{
+       if (!Config->global_implementation[I_OnCheckReady])
+               return true;
+
+       for (int i = 0; i <= MODCOUNT; i++)
+       {
+               if (Config->implement_lists[i][I_OnCheckReady])
+               {
+                       int res = modules[i]->OnCheckReady(user);
+                       if (!res)
+                               return false;
+               }
+       }
+       return true;
+}
+
+