Sort CAPAB CHANMODES and USERMODES

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

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 46f4a69eb7605256ceb240330f1b19a158111adf..00b728b51dbf9c20162a84d0c95207073591b869 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -45,19 +45,9 @@ class ModuleWaitPong : public Module
                        killonbadreply = true;
        }
 
-       std::string RandString()
+       ModResult OnUserRegister(LocalUser* user)
        {
-               char out[11];
-               for(unsigned int i = 0; i < 10; i++)
-                       out[i] = ((rand() % 26) + 65);
-               out[10] = '\0';
-
-               return out;
-       }
-
-       ModResult OnUserRegister(User* user)
-       {
-               std::string pingrpl = RandString();
+               std::string pingrpl = ServerInstance->GenRandomStr(10);
 
                user->Write("PING :%s", pingrpl.c_str());
 
@@ -68,7 +58,7 @@ class ModuleWaitPong : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User* user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser* user, bool validated, const std::string &original_line)
        {
                if (command == "PONG")
                {
@@ -92,7 +82,7 @@ class ModuleWaitPong : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnCheckReady(User* user)
+       ModResult OnCheckReady(LocalUser* user)
        {
                return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }