Forward port r9782: show IP (not unknown) for unauthed connections

[user/henk/code/inspircd.git] / src / modules / m_safelist.cpp

diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 524bbcc0fe046e535274f5f3766044aa5cae9ae3..e6bb24442de3620b61ae21d4159b63cda19041cd 100644 (file)
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -93,9 +93,9 @@ class ModuleSafeList : public Module
 
                if (global_listing >= LimitList && !IS_OPER(user))
                {
-                       user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick);
-                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                       user->WriteServ("NOTICE %s :*** Server load is currently too heavy. Please try again later.", user->nick.c_str());
+                       user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                        return 1;
                }
 
@@ -112,13 +112,13 @@ class ModuleSafeList : public Module
                /* Work around mIRC suckyness. YOU SUCK, KHALED! */
                if (pcnt == 1)
                {
-                       if (*parameters[0].c_str() == '<')
+                       if (parameters[0][0] == '<')
                        {
                                maxusers = atoi(parameters[0].c_str()+1);
                                ServerInstance->Logs->Log("m_safelist",DEBUG,"Max users: %d", maxusers);
                                pcnt = 0;
                        }
-                       else if (*parameters[0].c_str() == '>')
+                       else if (parameters[0][0] == '>')
                        {
                                minusers = atoi(parameters[0].c_str()+1);
                                ServerInstance->Logs->Log("m_safelist",DEBUG,"Min users: %d", minusers);
@@ -132,9 +132,9 @@ class ModuleSafeList : public Module
                {
                        if (ServerInstance->Time() < (*last_list_time)+ThrottleSecs)
                        {
-                               user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick);
-                               user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
-                               user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                               user->WriteServ("NOTICE %s :*** Woah there, slow down a little, you can't /LIST so often!",user->nick.c_str());
+                               user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+                               user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                                return 1;
                        }
 
@@ -153,7 +153,7 @@ class ModuleSafeList : public Module
                *llt = ServerInstance->Time();
                user->Extend("safelist_last", llt);
 
-               user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+               user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
 
                global_listing++;
 
@@ -183,22 +183,22 @@ class ModuleSafeList : public Module
                                        continue;
                                }
 
-                               if ((chan) && (chan->modes[CM_PRIVATE]))
+                               if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user)))
                                {
-                                       bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
+                                       bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob)));
                                        if ((users) && (display))
                                        {
-                                               int counter = snprintf(buffer, MAXBUF, "322 %s *", user->nick);
+                                               int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick.c_str(), users);
                                                amount_sent += counter + ServerNameSize;
                                                user->WriteServ(std::string(buffer));
                                        }
                                }
-                               else if ((chan) && (((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET]))) || (has_user)))
+                               else if ((chan) && ((((!(chan->IsModeSet('p'))) && (!(chan->IsModeSet('s'))))) || (has_user) || IS_OPER(user)))
                                {
-                                       bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
+                                       bool display = (match(chan->name, ld->glob) || (!chan->topic.empty() && match(chan->topic, ld->glob)));
                                        if ((users) && (display))
                                        {
-                                               int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user), chan->topic);
+                                               int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s", user->nick.c_str(), chan->name.c_str(), users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic.c_str());
                                                amount_sent += counter + ServerNameSize;
                                                user->WriteServ(std::string(buffer));
                                        }
@@ -210,7 +210,7 @@ class ModuleSafeList : public Module
                                                if (!ld->list_ended)
                                                {
                                                        ld->list_ended = true;
-                                                       user->WriteNumeric(323, "%s :End of channel list.",user->nick);
+                                                       user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
                                                }
                                        }
                                }