Removed some debug notices that were mistakenly in the DEFAULT loglevel

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 2923041fc98643a899706fe9bb71f83740a5360e..454604303161901ed84e4fc3937277de3d25cdd8 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -125,7 +125,7 @@ void readfile(file_cache &F, const char* fname)
 
 void Write_NoFormat(int sock, const char *text)
 {
-       if ((sock < 0) || (!text))
+       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
                return;
 
        char tb[MAXBUF];
@@ -148,7 +148,7 @@ void Write_NoFormat(int sock, const char *text)
 
 void Write(int sock,char *text, ...)
 {
-        if (sock < 0)
+        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                 return;
         if (!text)
         {
@@ -179,7 +179,7 @@ void Write(int sock,char *text, ...)
 
 void WriteServ_NoFormat(int sock, const char* text)
 {
-       if ((sock < 0) || (!text))
+       if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS))
                return;
        char tb[MAXBUF];
        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text);
@@ -203,7 +203,7 @@ void WriteServ_NoFormat(int sock, const char* text)
 
 void WriteServ(int sock, char* text, ...)
 {
-        if (sock < 0)
+        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                 return;
         if (!text)
         {
@@ -234,10 +234,10 @@ void WriteServ(int sock, char* text, ...)
 
 void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
 {
-       if ((sock < 0) || (!text) || (!user))
+       if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS))
                return;
        char tb[MAXBUF];
-       int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,text);
+       int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text);
        chop(tb);
        if (fd_ref_table[sock])
        {
@@ -258,7 +258,7 @@ void WriteFrom_NoFormat(int sock, userrec *user, const char* text)
 
 void WriteFrom(int sock, userrec *user,char* text, ...)
 {
-        if (sock < 0)
+        if ((sock < 0) || (sock > MAX_DESCRIPTORS))
                 return;
         if ((!text) || (!user))
         {
@@ -270,7 +270,7 @@ void WriteFrom(int sock, userrec *user,char* text, ...)
        char textbuffer[MAXBUF],tb[MAXBUF];
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
-        int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer);
+        int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer);
         chop(tb);
         if (fd_ref_table[sock])
         {
@@ -308,7 +308,7 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...)
         // if no source given send it from the server.
         if (!source)
         {
-                WriteServ(dest->fd,":%s %s",Config->ServerName,textbuffer);
+                WriteServ_NoFormat(dest->fd,textbuffer);
         }
         else
         {
@@ -322,7 +322,7 @@ void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data)
                return;
        if (!source)
        {
-               WriteServ(dest->fd,":%s %s",Config->ServerName,data);
+               WriteServ_NoFormat(dest->fd,data);
        }
        else
        {
@@ -484,7 +484,7 @@ void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* tex
 /* 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* text, ...)
+void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...)
 {
         if ((!Ptr) || (!user) || (!text))
         {
@@ -497,7 +497,23 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
         vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
-        std::map<char*,char*> *ulist= Ptr->GetUsers();
+        std::map<char*,char*> *ulist;
+       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 (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
                 char* o = i->second;
@@ -507,14 +523,29 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...)
         }
 }
 
-void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, const char* text)
+void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
 {
         if ((!Ptr) || (!user) || (!text))
         {
                 log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter");
                 return;
         }
-        std::map<char*,char*> *ulist= Ptr->GetUsers();
+        std::map<char*,char*> *ulist;
+        switch (status)
+        {
+                case '@':
+                        ulist = Ptr->GetOppedUsers();
+                break;  
+                case '%':
+                        ulist = Ptr->GetHalfoppedUsers();
+                break;
+                case '+':
+                        ulist = Ptr->GetVoicedUsers();
+                break;
+                default:
+                       ulist = Ptr->GetUsers();
+               break;
+        }
         for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
         {
                 char* o = i->second;
@@ -637,7 +668,6 @@ void WriteCommon_NoFormat(userrec *u, const char* text)
 }
 
 
-
 /* write a formatted string to all users who share at least one common
  * channel, NOT including the source user e.g. for use in QUIT */
 
@@ -655,11 +685,34 @@ void WriteCommonExcept(userrec *u, char* text, ...)
         }
 
         char textbuffer[MAXBUF];
+       char oper_quit[MAXBUF];
+       bool quit_munge = false;
+
         va_list argsPtr;
         va_start (argsPtr, text);
-        vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+        int total = vsnprintf(textbuffer, MAXBUF, text, argsPtr);
         va_end(argsPtr);
 
+       if ((Config->HideSplits) && (total > 6))
+       {
+               /* Yeah yeah, this is ugly. But its fast, live with it. */
+               char* check = textbuffer;
+               if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
+               {
+                       std::stringstream split(check);
+                       std::string server_one;
+                       std::string server_two;
+                       split >> server_one;
+                       split >> server_two;
+                       if ((FindServerName(server_one)) && (FindServerName(server_two)))
+                       {
+                               strlcpy(oper_quit,textbuffer,MAXBUF);
+                               strlcpy(check,"*.net *.split",MAXQUIT);
+                               quit_munge = true;
+                       }
+               }
+       }
+
         memset(&already_sent,0,MAX_DESCRIPTORS);
 
        unsigned int y = u->chans.size();
@@ -677,7 +730,18 @@ void WriteCommonExcept(userrec *u, char* text, ...)
                                         if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
                                         {
                                                 already_sent[otheruser->fd] = 1;
-                                                WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+                                               if (quit_munge)
+                                               {
+                                                       if (*otheruser->oper)
+                                                       {
+                                                               WriteFrom_NoFormat(otheruser->fd,u,oper_quit);
+                                                       }
+                                                       else
+                                                       {
+                                                               WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+                                                       }
+                                               }
+                                               else WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
                                         }
                                 }
                         }
@@ -1000,7 +1064,7 @@ void purge_empty_chans(userrec* u)
 }
 
 
-char* chanmodes(chanrec *chan)
+char* chanmodes(chanrec *chan, bool showkey)
 {
        static char scratch[MAXBUF];
        static char sparam[MAXBUF];
@@ -1032,7 +1096,9 @@ char* chanmodes(chanrec *chan)
         if (chan->binarymodes & CM_PRIVATE)
                 *offset++ = 'p';
         if (*chan->key)
-               snprintf(sparam,MAXBUF," %s",chan->key);
+       {
+               snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
+       }
         if (chan->limit)
         {
                 char foo[24];