Added some missing parameter checking in m_swhois

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 2a022449f96d9e165684539262450dd2cf67146b..ee257350ed523bd3efbde751c25f0af35bebc887 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -15,16 +15,38 @@
 #include "users.h"
 #include "cull_list.h"
 
-CullItem::CullItem(userrec* u, std::string &r)
+CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
 {
        this->user = u;
        this->reason = r;
+       this->silent = false;
+       /* Seperate oper reason not set, use the user reason */
+       if (*o_reason)
+               this->oper_reason = o_reason;
+       else
+               this->oper_reason = r;
 }
 
-CullItem::CullItem(userrec* u, const char* r)
+CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
 {
        this->user = u;
        this->reason = r;
+       this->silent = false;
+       /* Seperate oper reason not set, use the user reason */
+       if (*o_reason)
+               this->oper_reason = o_reason;
+       else
+               this->oper_reason = r;
+}
+
+void CullItem::MakeSilent()
+{
+       this->silent = true;
+}
+
+bool CullItem::IsSilent()
+{
+       return this->silent;
 }
 
 CullItem::~CullItem()
@@ -41,28 +63,46 @@ std::string& CullItem::GetReason()
        return this->reason;
 }
 
+std::string& CullItem::GetOperReason()
+{
+       return this->oper_reason;
+}
+
 CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
        list.clear();
        exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string &reason)
+void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason)
 {
-       AddItem(user, reason.c_str());
+       AddItem(user, reason.c_str(), o_reason);
 }
 
 
-void CullList::AddItem(userrec* user, const char* reason)
+void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
 {
        if (exempt.find(user) == exempt.end())
        {
-               CullItem item(user,reason);
+               CullItem item(user, reason, o_reason);
                list.push_back(item);
                exempt[user] = user;
        }
 }
 
+void CullList::MakeSilent(userrec* user)
+{
+       for (std::vector<CullItem>::iterator a = list.begin(); a != list.end(); ++a)
+       {
+               if (a->GetUser() == user)
+               {
+                       a->MakeSilent();
+                       break;
+               }
+       }
+       return;
+}
+
 int CullList::Apply()
 {
        int n = list.size();
@@ -72,10 +112,14 @@ int CullList::Apply()
 
                user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
                std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
+               const char* preset_reason = a->GetUser()->GetOperQuit();
                std::string reason = a->GetReason();
+               std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
 
                if (reason.length() > MAXQUIT - 1)
                        reason.resize(MAXQUIT - 1);
+               if (oper_reason.length() > MAXQUIT - 1)
+                       oper_reason.resize(MAXQUIT - 1);
 
                if (a->GetUser()->registered != REG_ALL)
                        if (ServerInstance->unregistered_count)
@@ -83,16 +127,16 @@ int CullList::Apply()
 
                if (IS_LOCAL(a->GetUser()))
                {
-                       a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]", a->GetUser()->ident, a->GetUser()->host, oper_reason.c_str());
                        if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
                                a->GetUser()->FlushWriteBuf();
                }
 
                if (a->GetUser()->registered == REG_ALL)
                {
+                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(), reason, oper_reason));
                        a->GetUser()->PurgeEmptyChannels();
-                       a->GetUser()->WriteCommonExcept("QUIT :%s",reason.c_str());
-                       FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason));
+                       a->GetUser()->WriteCommonQuit(reason, oper_reason);
                }
 
                FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
@@ -122,9 +166,19 @@ int CullList::Apply()
                if (a->GetUser()->registered == REG_ALL)
                {
                        if (IS_LOCAL(a->GetUser()))
-                               ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       {
+                               if (!a->IsSilent())
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               }
+                       }
                        else
-                               ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+                       {
+                               if ((!ServerInstance->SilentULine(a->GetUser()->server)) && (!a->IsSilent()))
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+                               }
+                       }
                        a->GetUser()->AddToWhoWas();
                }
 
@@ -145,3 +199,4 @@ int CullList::Apply()
        }
        return n;
 }
+