WriteChannel* functions and ChanExceptSender* functions are now methods of chanrec...

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 26f92c4df1352be0458702c41e7a5b94e00d131c..e7ecb56a14f5594712219440d9242ec1868af511 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -165,11 +165,11 @@ void Write_NoFormat(int sock, const char *text)
        {
                bytes = snprintf(tb,MAXBUF,"%s\r\n",text);
 
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
+               if (Config->GetIOHook(fd_ref_table[sock]->GetPort()))
                {
                        try
                        {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+                               Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes);
                        }
                        catch (ModuleException& modexcept)
                        {
@@ -213,11 +213,11 @@ void Write(int sock, char *text, ...)
                va_end(argsPtr);
                bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer);
 
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
+               if (Config->GetIOHook(fd_ref_table[sock]->GetPort()))
                {
                        try
                        {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+                               Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes);
                        }
                        catch (ModuleException& modexcept)
                        {
@@ -249,11 +249,11 @@ void WriteServ_NoFormat(int sock, const char* text)
        {
                bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
 
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
+               if (Config->GetIOHook(fd_ref_table[sock]->GetPort()))
                {
                        try
                        {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+                               Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes);
                        }
                        catch (ModuleException& modexcept)
                        {
@@ -313,11 +313,11 @@ void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
        {
                bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
 
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
+               if (Config->GetIOHook(fd_ref_table[sock]->GetPort()))
                {
                        try
                        {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+                               Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes);
                        }
                        catch (ModuleException& modexcept)
                        {
@@ -360,11 +360,11 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
                va_end(argsPtr);
                bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
 
-               if (Config->GetIOHook(fd_ref_table[sock]->port))
+               if (Config->GetIOHook(fd_ref_table[sock]->GetPort()))
                {
                        try
                        {
-                               Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes);
+                               Config->GetIOHook(fd_ref_table[sock]->GetPort())->OnRawSocketWrite(sock,tb,bytes);
                        }
                        catch (ModuleException& modexcept)
                        {
@@ -428,245 +428,6 @@ void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data)
        }
 }
 
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) */
-
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,textbuffer);
-       }
-}
-
-void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (i->second->fd != FD_MAGIC_NUMBER)
-                       WriteTo_NoFormat(user,i->second,text);
-       }
-}
-
-
-/* write formatted text from a source user to all users on a channel
- * including the sender (NOT for privmsg, notice etc!) doesnt send to
- * users on remote servers */
-
-void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,textbuffer);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,textbuffer);
-                       }
-               }
-       }
-}
-
-void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
-               {
-                       if (!user)
-                       {
-                               WriteServ_NoFormat(i->second->fd,text);
-                       }
-                       else
-                       {
-                               WriteTo_NoFormat(user,i->second,text);
-                       }
-               }
-       }
-}
-
-
-
-void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,textbuffer);
-       }
-}
-
-void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter");
-               return;
-       }
-
-       ulist = Ptr->GetUsers();
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if (IS_LOCAL(i->second))
-                       WriteServ_NoFormat(i->second->fd,text);
-       }
-}
-
-
-
-/* write formatted text from a source user to all users on a channel except
- * for the sender (for privmsg etc) */
-
-void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
-{
-       char textbuffer[MAXBUF];
-       va_list argsPtr;
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
-       }
-
-       va_start(argsPtr, text);
-       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       log(DEBUG,"%d users to write to",ulist->size());
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,textbuffer);
-       }
-}
-
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
-{
-       CUList *ulist;
-
-       if ((!Ptr) || (!user) || (!text))
-       {
-               log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
-               return;
-       }
-
-       switch (status)
-       {
-               case '@':
-                       ulist = Ptr->GetOppedUsers();
-                       break;  
-               case '%':
-                       ulist = Ptr->GetHalfoppedUsers();
-                       break;
-               case '+':
-                       ulist = Ptr->GetVoicedUsers();
-                       break;
-               default:
-                       ulist = Ptr->GetUsers();
-                       break;
-       }
-
-       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-       {
-               if ((IS_LOCAL(i->second)) && (user != i->second))
-                       WriteFrom_NoFormat(i->second->fd,user,text);
-       }
-}
-
 std::string GetServerDescription(const char* servername)
 {
        std::string description = "";
@@ -1405,7 +1166,7 @@ ConnectClass GetClass(userrec *user)
 {
        for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++)
        {
-               if ((match(insp_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str())))
+               if ((match(user->GetIPString(),i->host.c_str(),true)) || (match(user->host,i->host.c_str())))
                {
                        return *i;
                }