Remove support for MODE_HIDECHANS

Conflicts:
	.gitignore

.dockerignore

@@ -0,0 +1 @@
+.gitignore

.gitignore

@@ -40,3 +40,5 @@ tools/mkpasswd
 tools/viconf
 include/serno.h
 libratbox/src/version.c.last
+*.pyc
+.git

CREDITS

@@ -1,5 +1,8 @@
 $Id: CREDITS 3133 2007-01-21 15:38:16Z jilles $
  
+This is a copy of Elemental-IRCd running patches specific for the
+PonyChat IRC network.
+ 
 Elemental-IRCd is a fork of the now-defunct ShadowIRCD project.
  
 The Elemental-IRCd team is listed below in nick-alphabetical order:

NEWS

@@ -1,6 +1,10 @@
 This is elemental-ircd 6.6.1, Copyright (c) 2014 elemental-ircd team.
 See LICENSE for licensing details (GPL v2).
 
+-- elemental-ircd 6.6.2
+
+Fix ban logic
+
 -- elemental-ircd 6.6.1
 
 All code is now in the linux kernel coding style. Patches that do not

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for elemental-ircd 6.6.1.
+# Generated by GNU Autoconf 2.69 for elemental-ircd 6.6.2+ponychat.
 #
 # 2014 elemental-ircd Team
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='elemental-ircd'
 PACKAGE_TARNAME='elemental-ircd'
-PACKAGE_VERSION='6.6.1'
-PACKAGE_STRING='elemental-ircd 6.6.1'
+PACKAGE_VERSION='6.6.2+ponychat'
+PACKAGE_STRING='elemental-ircd 6.6.2+ponychat'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1303,7 +1303,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures elemental-ircd 6.6.1 to adapt to many kinds of systems.
+\`configure' configures elemental-ircd 6.6.2+ponychat to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1364,7 +1364,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of elemental-ircd 6.6.1:";;
+     short | recursive ) echo "Configuration of elemental-ircd 6.6.2+ponychat:";;
    esac
   cat <<\_ACEOF
 
@@ -1488,7 +1488,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-elemental-ircd configure 6.6.1
+elemental-ircd configure 6.6.2+ponychat
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2092,7 +2092,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by elemental-ircd $as_me 6.6.1, which was
+It was created by elemental-ircd $as_me 6.6.2+ponychat, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10100,7 +10100,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by elemental-ircd $as_me 6.6.1, which was
+This file was extended by elemental-ircd $as_me 6.6.2+ponychat, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10166,7 +10166,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-elemental-ircd config.status 6.6.1
+elemental-ircd config.status 6.6.2+ponychat
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -10,7 +10,7 @@ AC_PREREQ(2.57)
 dnl Sneaky way to get an Id tag into the configure script
 AC_COPYRIGHT([2014 elemental-ircd Team])
 
-AC_INIT([elemental-ircd],[6.6.1])
+AC_INIT([elemental-ircd],[6.6.2+ponychat])
 
 AC_CONFIG_HEADER(include/setup.h)
 

help/opers/umode

@@ -25,6 +25,4 @@ User modes: (* designates that the umode is oper only)
          +G     - "soft caller id" mode - same as +g but automatically allows
                   anyone who's in a common channel with you to message you.
          +V     - Prevents you from receiving invites.
-         +I     - Prevents non-opers from seeing your channel list in
-                  a whois query.
          +Z     - Is connected via SSL (set only on connection).

help/users/umode

@@ -14,8 +14,6 @@ User modes: (? designates that the umode is provided by an extension
          +B     - Marks you as a bot in /whois.
          +C     - Prevents you from receiving CTCPs other than ACTION.
          +D     - Deaf - ignores all channel messages.
-         +I     - Prevents non-opers from seeing your channel list in
-                  a whois query.
          +Q     - Prevents you from being affected by channel forwarding.
          +R     - Prevents non accept unidentified users from messaging you.
          +G     - "soft caller id" mode - same as +g but automatically allows

include/client.h

@@ -419,7 +419,6 @@ struct ListClient {
 #define UMODE_NOINVITE	   0x0800	/* block invites */
 #define UMODE_BOT	   0x8000	/* mark as a bot in whois */
 #define UMODE_SCALLERID    0x40000	/* soft caller id */
-#define UMODE_HIDECHANS    0x80000	/* hide channels in whois */
 
 /* user information flags, only settable by remote mode or local oper */
 #define UMODE_OPER         0x1000	/* Operator */

modules/m_whois.c

@@ -262,7 +262,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
     t = buf + mlen;
 
-    if (!IsService(target_p) && (!(target_p->umodes & UMODE_HIDECHANS) || IsOper(source_p))) {
+    if (!IsService(target_p)) {
         RB_DLINK_FOREACH(ptr, target_p->user->channel.head) {
             msptr = ptr->data;
             chptr = msptr->chptr;

src/chmode.c

@@ -219,7 +219,7 @@ get_channel_access(struct Client *source_p, struct membership *msptr)
 /* check_bans_number()
  *
  * inputs	- client, channel ban list
- * outputs	- 0 on ban being allowed, 1 on ban being disallowed
+ * outputs	- 1 on ban being allowed, 0 on ban being disallowed
  * side effects	- none
  */
 int
@@ -227,10 +227,10 @@ check_bans_number(struct Client *source_p, struct Channel *chptr, rb_dlink_list
 {
     if (rb_dlink_list_length(list) >= (chptr->mode.mode & MODE_EXLIMIT ?
                                        ConfigChannel.max_bans_large : ConfigChannel.max_bans)) {
-        return 0;
+        return 1;
     }
 
-    return 1;
+    return 0;
 }
 
 /* add_id()

src/newconf.c

@@ -296,7 +296,6 @@ static struct mode_table umode_table[] = {
     {"noinvite",	UMODE_NOINVITE	},
     {"bot",		UMODE_BOT	},
     {"override",	UMODE_OVERRIDE	},
-    {"hidechans",	UMODE_HIDECHANS	},
     {NULL, 0}
 };
 

src/s_user.c

@@ -74,7 +74,7 @@ int user_modes[256] = {
     0,			/* F */
     UMODE_SCALLERID,	/* G */
     0,			/* H */
-    UMODE_HIDECHANS,	/* I */
+    0,			/* I */
     0,			/* J */
     0,			/* K */
     0,			/* L */