Streamline effect of "MorePrivacy" option (WHOIS, LIST)

[ngircd-alex.git] / src / ngircd / irc-channel.c

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 4bd5a9d1ff30fb4a7e2cb7c909c68d21b93b06a5..c7a3e1b31e7f8b81e79f8d8854446965fb0f3351 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
+ * Copyright (c)2001-2015 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,13 +16,11 @@
  * IRC channel commands
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "defines.h"
 #include "conn.h"
 #include "channel.h"
 #include "conn-func.h"
@@ -37,7 +35,6 @@
 #include "irc-write.h"
 #include "conf.h"
 
-#include "exp.h"
 #include "irc-channel.h"
 
 /**
@@ -129,7 +126,7 @@ join_allowed(CLIENT *Client, CHANNEL *chan, const char *channame,
                return false;
        }
 
-       if (Channel_HasMode(chan, 'O') && !Client_OperByMe(Client)) {
+       if (Channel_HasMode(chan, 'O') && !Client_HasMode(Client, 'o')) {
                /* Only IRC operators are allowed! */
                IRC_WriteErrClient(Client, ERR_OPONLYCHANNEL_MSG,
                                   Client_ID(Client), channame);
@@ -309,7 +306,6 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        assert (Client != NULL);
        assert (Req != NULL);
 
-       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
        _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
        /* Is argument "0"? */
@@ -324,7 +320,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        channame = strtok_r(channame, ",", &lastchan);
 
        /* Make sure that "channame" is not the empty string ("JOIN :") */
-       if (! channame)
+       if (!channame)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
@@ -440,20 +436,19 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
        _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
 
        /* Loop over all the given channel names */
        chan = strtok(Req->argv[0], ",");
 
        /* Make sure that "chan" is not the empty string ("PART :") */
-       if (! chan)
+       if (!chan)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
        while (chan) {
                Channel_Part(target, Client, chan,
-                            Req->argc > 1 ? Req->argv[1] : Client_ID(target));
+                            Req->argc > 1 ? Req->argv[1] : "");
                chan = strtok(NULL, ",");
        }
 
@@ -482,9 +477,6 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       IRC_SetPenalty(Client, 1);
-
-       _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        chan = Channel_Search(Req->argv[0]);
@@ -581,9 +573,6 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
        assert(Client != NULL);
        assert(Req != NULL);
 
-       IRC_SetPenalty(Client, 2);
-
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        if (Req->argc > 0)
@@ -619,7 +608,8 @@ IRC_LIST( CLIENT *Client, REQUEST *Req )
                                /* Gotcha! */
                                if (!Channel_HasMode(chan, 's')
                                    || Channel_IsMemberOf(chan, from)
-                                   || (!Conf_MorePrivacy && Client_OperByMe(Client))) {
+                                   || Client_HasMode(from, 'o'))
+                               {
                                        if ((Conf_MaxListSize > 0)
                                            && IRC_CheckListTooBig(from, count,
                                                                   Conf_MaxListSize,