Remove OnUserPreNotice and OnUserNotice hooks, add MessageType argument to OnUserMess...

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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 8ed87a338015230a2da8ddb6aaa036eacb248cca..09c9a5bde2431f59bdc1c28a8732f4a3ba278078 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -322,36 +322,9 @@ unsigned int UserManager::LocalUserCount()
 
 void UserManager::ServerNoticeAll(const char* text, ...)
 {
-       if (!text)
-               return;
-
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       va_start (argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       const std::string message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + textbuffer;
-
-       for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-       {
-               User* t = *i;
-               t->WriteServ(message);
-       }
-}
-
-void UserManager::ServerPrivmsgAll(const char* text, ...)
-{
-       if (!text)
-               return;
-
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       va_start (argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       const std::string message = "PRIVMSG $" + ServerInstance->Config->ServerName + " :" + textbuffer;
+       std::string message;
+       VAFORMAT(message, text, text);
+       message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + message;
 
        for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
        {
@@ -360,7 +333,6 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
        }
 }
 
-
 /* return how many users have a given mode e.g. 'a' */
 int UserManager::ModeCount(const char mode)
 {