diff options
| -rw-r--r-- | include/helperfuncs.h | 1 | ||||
| -rw-r--r-- | include/inspircd.h | 2 | ||||
| -rw-r--r-- | src/helperfuncs.cpp | 21 | ||||
| -rw-r--r-- | src/inspircd.cpp | 23 |
4 files changed, 25 insertions, 22 deletions
diff --git a/include/helperfuncs.h b/include/helperfuncs.h index 7a55e5d23..40df4c93c 100644 --- 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 b2ed4da20..59dc7eab0 100644 --- 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 71a8d24a0..2c045c3ce 100644 --- 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 6dad70a51..758dd4757 100644 --- 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; +} + + |