Fixed indents and documentation

(also updated the copyright date on the txt I edited)

diff --git a/doc/Modes.txt b/doc/Modes.txt
index a9317873a92192454883ff23006a6e0fb01097c6..61d5e8f66a7cdb83a4fdbe0adf98e6c2420f5f18 100644 (file)
--- a/doc/Modes.txt
+++ b/doc/Modes.txt
@@ -2,7 +2,7 @@
                      ngIRCd - Next Generation IRC Server
                            http://ngircd.barton.de/
 
-               (c)2001-2014 Alexander Barton and Contributors.
+               (c)2001-2015 Alexander Barton and Contributors.
                ngIRCd is free software and published under the
                    terms of the GNU General Public License.
 
@@ -28,6 +28,7 @@ channels he is using at the moment.
   C    19      Only users that share a channel are allowed to send messages.
   F    22      Relaxed flood protection (only settable by IRC Operators).
   i    0.0.1   User is "invisible".
+  I 23 No channels are shown on WHOIS (IRC Operators can always see those).
   o    0.0.1   User is IRC operator.
   q    20      User is protected, can not be kicked from a channel.
   r    0.0.1   User is restricted.

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index e261b7f68874940e80f8f8676269299d704134e1..7bb453df67cc853addca41e34861201cba2b7982 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -327,12 +327,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
 
                        /* Secret channel? */
                        if (Channel_HasMode(chan, 's')
-                               && !Channel_IsMemberOf(chan, Client))
+                           && !Channel_IsMemberOf(chan, Client))
                                continue;
 
                        /* Local channel and request is not from a user? */
                        if (Client_Type(Client) == CLIENT_SERVER
-                               && Channel_IsLocal(chan))
+                           && Channel_IsLocal(chan))
                                continue;
 
                        /* Concatenate channel names */
@@ -340,7 +340,6 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIENT *c)
                                strlcat(str, " ", sizeof(str));
 
                        who_flags_qualifier(Client, Channel_UserModes(chan, c),
-                                               str, sizeof(str));
                        strlcat(str, Channel_Name(chan), sizeof(str));
 
                        if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {