Port bindings for gnutls now bind via ip:port, rather than on all ports for that...

[user/henk/code/inspircd.git] / src / modes / cmode_v.cpp

diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 8b94caf08b4c0376e5ee054716dcbb7ef8d0e012..45a9e1879cefe5c963eb400e91cc28508dfe29a3 100644 (file)
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -1,3 +1,4 @@
+
 /*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
@@ -47,11 +48,11 @@ ModePair ModeChannelVoice::ModeSet(User*, User*, Channel* channel, const std::st
 
 void ModeChannelVoice::RemoveMode(Channel* channel)
 {
-       CUList* list = channel->GetVoicedUsers();
+       CUList* clist = channel->GetVoicedUsers();
        CUList copy;
        char moderemove[MAXBUF];
 
-       for (CUList::iterator i = list->begin(); i != list->end(); i++)
+       for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
        {
                User* n = i->first;
                copy.insert(std::make_pair(n,n->nick));
@@ -69,7 +70,7 @@ void ModeChannelVoice::RemoveMode(User*)
 {
 }
 
-ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        int status = channel->GetStatus(source);
 
@@ -136,9 +137,7 @@ std::string ModeChannelVoice::DelVoice(User *user,const char *dest,Channel *chan
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)) ||
-                                       user == d && ServerInstance->Config->AllowDevoiceSelf
-                               )
+                               if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)))
                                {
                                        user->WriteServ("482 %s %s :You are not a channel (half)operator",user->nick, chan->name);
                                        return "";