From: pk910 <philipp@zoelle1.de>
Date: Mon, 26 Dec 2011 00:00:03 +0000 (+0100)
Subject: fixed cmd_devoiceall & cmd_deopall
X-Git-Tag: v5.3~98
X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=56615b160d8d0bbe27fa37cde07030afb3939128

fixed cmd_devoiceall & cmd_deopall
---

diff --git a/src/cmd_neonserv_deopall.c b/src/cmd_neonserv_deopall.c
index 0cef7b1..9944918 100644
--- a/src/cmd_neonserv_deopall.c
+++ b/src/cmd_neonserv_deopall.c
@@ -71,8 +71,8 @@ static void neonserv_cmd_deopall_async1(struct ClientSocket *client, struct Clie
     issuer_access = getChannelAccess(user, chan);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(nickmask && match(nickmask, chanuser->user->nick)) continue;
-        victim_access = getChannelAccess(user, chan);
-        if(victim_access >= issuer_access) continue;
+        victim_access = getChannelAccess(chanuser->user, chan);
+        if(victim_access >= issuer_access || isNetworkService(chanuser->user)) continue;
         if(!(chanuser->flags & CHANUSERFLAG_OPPED)) continue;
         modeBufferDeop(modeBuf, chanuser->user->nick);
         done_users++;
diff --git a/src/cmd_neonserv_devoiceall.c b/src/cmd_neonserv_devoiceall.c
index 9fec9b4..0a0d5d6 100644
--- a/src/cmd_neonserv_devoiceall.c
+++ b/src/cmd_neonserv_devoiceall.c
@@ -33,7 +33,7 @@ CMD_BIND(neonserv_cmd_devoiceall) {
     issuer_access = getChannelAccess(user, chan);
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {
         if(nickmask && match(nickmask, chanuser->user->nick)) continue;
-        victim_access = getChannelAccess(user, chan);
+        victim_access = getChannelAccess(chanuser->user, chan);
         if(victim_access >= issuer_access) continue;
         if(!(chanuser->flags & CHANUSERFLAG_VOICED)) continue;
         modeBufferDevoice(modeBuf, chanuser->user->nick);