Remove some debug

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

diff --git a/src/channels.cpp b/src/channels.cpp
index 4b1bc530914c8c37e9238bb397b978f1f2406d33..5383f4aba2b39bed9cd95514896594a574641b17 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -37,21 +37,12 @@ void chanrec::SetMode(char mode,bool mode_on)
 
 void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
 {
-       ServerInstance->Log(DEBUG,"SetModeParam called");
-       
        CustomModeList::iterator n = custom_mode_params.find(mode);     
 
        if (mode_on)
        {
                if (n == custom_mode_params.end())
-               {
                        custom_mode_params[mode] = strdup(parameter);
-                       ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
-               }
-               else
-               {
-                       ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
-               }
        }
        else
        {
@@ -70,22 +61,18 @@ bool chanrec::IsModeSet(char mode)
 
 std::string chanrec::GetModeParameter(char mode)
 {
-       if (mode == 'k')
+       switch (mode)
        {
-               return this->key;
-       }
-       else if (mode == 'l')
-       {
-               return ConvToStr(this->limit);
-       }
-       else
-       {
-               CustomModeList::iterator n = custom_mode_params.find(mode);
-               if (n != custom_mode_params.end())
-               {
-                       return n->second;
-               }
-               return "";
+               case 'k':
+                       return this->key;
+               case 'l':
+                       return ConvToStr(this->limit);
+               default:
+                       CustomModeList::iterator n = custom_mode_params.find(mode);
+                       if (n != custom_mode_params.end())
+                               return n->second;
+                       return "";
+               break;
        }
 }
 
@@ -229,7 +216,6 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
                *Ptr->topic = 0;
                *Ptr->setby = 0;
                Ptr->topicset = 0;
-               Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
                new_channel = true;
        }
        else
@@ -307,10 +293,6 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
                                }
                        }
                }
-               else
-               {
-                       Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
-               }
        }
 
        /* NOTE: If the user is an oper here, we can extend their user->chans by up to
@@ -339,7 +321,6 @@ chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bo
 
        if (new_channel)
        {
-               Instance->Log(DEBUG,"BLAMMO, Whacking channel.");
                /* Things went seriously pear shaped, so take this away. bwahaha. */
                chan_hash::iterator n = Instance->chanlist->find(cname);
                if (n != Instance->chanlist->end())
@@ -468,7 +449,6 @@ long chanrec::PartUser(userrec *user, const char* reason)
                /* kill the record */
                if (iter != ServerInstance->chanlist->end())
                {
-                       ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name);
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
                        ServerInstance->chanlist->erase(iter);
                }
@@ -645,11 +625,15 @@ void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
 void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text)
 {
        CUList *ulist = this->GetUsers();
+       char tb[MAXBUF];
+
+       snprintf(tb,MAXBUF,":%s %s",ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
+       std::string out = tb;
 
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
                if (IS_LOCAL(i->second))
-                       i->second->WriteServ(text);
+                       i->second->Write(out);
        }
 }
 
@@ -750,7 +734,7 @@ char* chanrec::ChanModes(bool showkey)
        static char scratch[MAXBUF];
        static char sparam[MAXBUF];
        char* offset = scratch;
-       std::string extparam = "";
+       std::string extparam;
 
        *scratch = '\0';
        *sparam = '\0';
@@ -809,12 +793,9 @@ void chanrec::UserList(userrec *user)
                return;
 
        FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
-       ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT);
        if (MOD_RESULT == 1)
                return;
 
-       ServerInstance->Log(DEBUG,"Using builtin NAMES list generation");
-
        dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
 
        int numusers = 0;
@@ -989,7 +970,6 @@ int chanrec::GetStatus(userrec *user)
 
 void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
 {
-       ServerInstance->Log(DEBUG,"Setting prefix: %c on user %s in %s to %d", prefix, user->nick, this->name, adding);
        prefixlist::iterator n = prefixes.find(user);
        prefixtype pfx = std::make_pair(prefix,prefix_value);
        if (adding)
@@ -1023,7 +1003,6 @@ void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, b
                                n->second.erase(x);
                }
        }
-       ServerInstance->Log(DEBUG,"Added prefix %c to %s for %s, prefixlist size is now %d", prefix, this->name, user->nick, prefixes.size());
 }
 
 void chanrec::RemoveAllPrefixes(userrec* user)
@@ -1031,7 +1010,6 @@ void chanrec::RemoveAllPrefixes(userrec* user)
        prefixlist::iterator n = prefixes.find(user);
        if (n != prefixes.end())
        {
-               ServerInstance->Log(DEBUG,"Removed prefixes from %s for %s, prefixlist size is now %d", this->name, user->nick, prefixes.size());
                prefixes.erase(n);
        }
 }