Release 2.0.7

This legacy compat command was removed in the 1205 protocol.

.BANNER

@@ -1,5 +1,5 @@
    ___
-  / _ \  http://www.anope.org
+  / _ \  https://www.anope.org/
  | /_\ | _ __  _ _  _ _   ___
  |  _  || '_ \/ _ \/ _ \ / _ \
  | | | || | |  |_|  |_| |  __/
@@ -15,4 +15,5 @@ Anope is a set of Services for IRC networks that allows users to
 manage their nicks and channels in a secure and efficient way,
 and administrators to manage their network with powerful tools.
 
-For all your Anope needs please visit our portal at www.anope.org
+For all your Anope needs please visit our portal at
+https://www.anope.org/

CMakeLists.txt

@@ -541,14 +541,14 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
       "bin\\\\anope.bat\\\" \\\"-debug -nofork" "Anope IRC Services (Debug and Window Logging)"
       "bin\\\\anope.bat\\\" \\\"-nofork" "Anope IRC Services (Window Logging)"
       "bin\\\\anope.bat\\\" \\\"-nothird" "Anope IRC Services (No Third Party Modules)"
-      "http://www.anope.org/" "Anope Web Site"
+      "https://www.anope.org/" "Anope Web Site"
     )
     # The following doesn't work, but a bug report has been filed about it
     #set(CPACK_CREATE_DESKTOP_LINK_${SERVICES_BINARY} TRUE)
     set(CPACK_NSIS_MUI_ICON "${Anope_SOURCE_DIR}/src\\\\win32\\\\anope-icon.ico")
     set(CPACK_NSIS_MUI_UNIICON "${Anope_SOURCE_DIR}/src\\\\win32\\\\anope-icon.ico")
     set(CPACK_NSIS_INSTALLED_ICON_NAME "${SERVICES_BINARY}")
-    set(CPACK_NSIS_URL_INFO_ABOUT "http://www.anope.org/")
+    set(CPACK_NSIS_URL_INFO_ABOUT "https://www.anope.org/")
     set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
   endif(WIN32)
   set(CPACK_SOURCE_PACKAGE_FILE_NAME "anope-${VERSION_FULL_NOBUILD}-source")

Config

@@ -2,7 +2,7 @@
 #
 # Configuration script for Services.
 #
-# Anope (c) 2003-2017 Anope Team
+# Anope (c) 2003-2019 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -173,7 +173,7 @@ done
 cmake --version 2>&1 > /dev/null
 if [ $? -ne 0 ] ; then
 	clear
-	echo "Anope requires CMake 2.4 or newer, which can be downloaded at http://cmake.org or through your system's package manager."
+	echo "Anope requires CMake 2.4 or newer, which can be downloaded at https://cmake.org/ or through your system's package manager."
 	echo "If you have installed CMake already, ensure it is in your PATH environment variable."
 	exit 0
 fi

data/botserv.example.conf

@@ -242,7 +242,7 @@ command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
  *   botserv/kick - Dummy help wrapper for the KICK command.
  *   botserv/kick/amsg - Configures BotServ's AMSG kicker.
  *   botserv/kick/badwords - Configures BotServ's badwords kicker.
- *   botserv/kick/bolds - Configures BotServ's bold text kiceker.
+ *   botserv/kick/bolds - Configures BotServ's bold text kicker.
  *   botserv/kick/caps - Configures BotServ's capital letters kicker.
  *   botserv/kick/colors - Configures BotServ's color kicker.
  *   botserv/kick/flood - Configures BotServ's flood kicker.
@@ -333,7 +333,7 @@ privilege
 /*
  * fantasy
  *
- * Allows 'fantaisist' commands to be used in channels.
+ * Allows 'fantasist' commands to be used in channels.
  *
  * Provides the commands:
  *   botserv/set/fantasy - Used for enabling or disabling BotServ's fantasist commands.

data/chanserv.example.conf

@@ -79,7 +79,7 @@ module
 	 * -      cs_secure: Enable channel security, requiring the user to be identified with NickServ in
 	 *                     order to be considered for being on the access list of the channel
 	 * -      secureops: Only allow operator status to be given if the user is on the access list
-	 * -  securefounder: Only allow the real founder of the channel to drop the channel, change it's
+	 * -  securefounder: Only allow the real founder of the channel to drop the channel, change its
 	 *                     password, or change the founder or successor
 	 * -       signkick: Use of ChanServ's KICK command will cause the user's nick to be signed to the kick.
 	 * - signkick_level: Same as above, but the kick will not be signed if the user is at the same access
@@ -193,12 +193,12 @@ module
  *
  * If you load cs_xop, you may define a XOP command to associate the privilege with.
  *
- * The name of privileges are uesd to associate them with channel modes. If you are using an IRCd that allows you to define additional
+ * The name of privileges are used to associate them with channel modes. If you are using an IRCd that allows you to define additional
  * channel status modes, such as InspIRCd, you can associate privileges (and thus access levels, flags, xop) with the mode by naming
  * the privileges appropriately. For example, if you had a channel mode called admin, you could create AUTOADMIN, ADMIN, and ADMINME
  * privileges which would automatically be associated with that channel mode.
  *
- * Defining new privileges here is not useful unless you have a module (eg, a third party one) made to check for
+ * Defining new privileges here is not useful unless you have a module (e.g. a third party one) made to check for
  * the specific level you are defining.
  *
  * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
@@ -420,7 +420,7 @@ privilege
  *
  * Used by chanserv/getkey and nickserv/ajoin.
  *
- * Users with this permission can get they channel key with GETKEY and
+ * Users with this permission can get their channel key with GETKEY and
  * can use nickserv/ajoin to join channels with keys.
  */
 privilege
@@ -692,7 +692,7 @@ privilege
  * chanserv/saset/noexpire and chanserv/set.
  *
  * Users with this permission can set what BotServ will kick for, change
- * BotServ and ChanServ settings, clone ChanServ channel setings, and
+ * BotServ and ChanServ settings, clone ChanServ channel settings, and
  * set ChanServ logging options.
  */
 privilege
@@ -836,8 +836,8 @@ command { service = "ChanServ"; name = "HELP"; command = "generic/help"; }
  * Provides commands chanserv/access and chanserv/levels.
  * Provides the access system "levels".
  *
- * Used for giving users access in channels using a levels system. Allows allows redefining which privileges
- * are representated by given level on a per channel basis.
+ * Used for giving users access in channels using a levels system. Allows redefining which privileges
+ * are represented by given level on a per channel basis.
  *
  * The "LIST" subcommand of chanserv/access will show every access entry on the channel, including access
  * entries not added by cs_access. The "level" of these entries will be the representation of the access
@@ -941,7 +941,7 @@ command { service = "ChanServ"; name = "ENTRYMSG"; command = "chanserv/entrymsg"
  * Used for giving users access in channels.
  *
  * The "LIST" subcommand of chanserv/flags will show every access entry on the channel, including access
- * entries not added by cs_flags. The "Flags" of these entries will be the flags representation of the
+ * entries not added by cs_flags. The "flags" of these entries will be the flags representation of the
  * privilege set granted by the access entry.
  */
 module { name = "cs_flags" }
@@ -1055,7 +1055,7 @@ command { service = "ChanServ"; name = "LOG"; command = "chanserv/log"; group =
  * Provides the command chanserv/mode and chanserv/modes.
  *
  * Used for changing mode locks and changing modes. Multiple commands may be mapped to chanserv/modes, the
- * configuration directive 'set' and 'unset' are used to tell chanserv/modes which modes should be set or
+ * configuration directives 'set' and 'unset' are used to tell chanserv/modes which modes should be set or
  * unset when the command is executed.
  */
 module
@@ -1163,7 +1163,7 @@ module
 	defbantype = 2
 
 	/*
-	 * If set, persisent channels have their creation times lowered to their
+	 * If set, persistent channels have their creation times lowered to their
 	 * original registration dates.
 	 */
 	persist_lower_ts = true
@@ -1287,7 +1287,7 @@ command { service = "ChanServ"; name = "UP"; command = "chanserv/up"; group = "c
  * Provides the access system "XOP".
  *
  * Used for giving users access in channels. Many commands may be linked to chanserv/xop, but the
- * privileges given by each is determined by the privilege:xop settings above. These commands should
+ * privileges given by each are determined by the privilege:xop settings above. These commands should
  * be ordered from highest to lowest, as each command inherits the privileges of the commands below
  * it.
  *
@@ -1309,7 +1309,7 @@ command { service = "ChanServ"; name = "VOP"; command = "chanserv/xop"; group =
 /*
  * cs_statusupdate
  *
- * This module automatically updates users status on channels when the
+ * This module automatically updates users' status on channels when the
  * channel's access list is modified.
  */
 module { name = "cs_statusupdate" }

data/chanstats.example.conf

@@ -32,7 +32,7 @@ module
 }
 command { service = "ChanServ"; name = "SET CHANSTATS"; command = "chanserv/set/chanstats"; }
 command { service = "NickServ"; name = "SET CHANSTATS"; command = "nickserv/set/chanstats"; }
-command { service = "NickServ"; name = "SASET CHANSTATS"; command = "nickserv/saset/chanstats"; }
+command { service = "NickServ"; name = "SASET CHANSTATS"; command = "nickserv/saset/chanstats"; permission = "nickserv/saset/chanstats"; }
 
 module { name = "cs_fantasy_stats" }
 command { service = "ChanServ"; name = "STATS"; command = "chanserv/stats"; }

data/example.conf

@@ -80,7 +80,7 @@
  * [OPTIONAL] Defines
  *
  * You can define values to other values, which can be used to easily change
- * many values in the configuration. at once.
+ * many values in the configuration at once.
  */
 
 /*
@@ -110,7 +110,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - https://some.misconfigured.network.com/services.conf"
 }
 
 /*
@@ -126,6 +126,7 @@ define
  * An example configuration for InspIRCd that is compatible with the below uplink
  * and serverinfo configuration would look like:
  *
+ *     # This goes in inspircd.conf, *NOT* your Anope config!
  *     <link name="services.localhost.net"
  *           ipaddr="127.0.0.1"
  *           port="7000"
@@ -137,19 +138,22 @@ define
  * An example configuration for UnrealIRCd that is compatible with the below uplink
  * and serverinfo configuration would look like:
  *
- *     link services.localhost.net
- *     {
- *          username *;
- *          hostname *;
- *          bind-ip "127.0.0.1";
- *          port 7000;
- *          hub *;
- *          password-connect "mypassword";
- *          password-receive "mypassword";
- *          class servers;
+ *     // This goes in unrealircd.conf, *NOT* your Anope config!
+ *     listen {
+ *         ip 127.0.0.1;
+ *         port 7000;
+ *         options {
+ *             serversonly;
+ *         };
+ *     };
+ *     link services.localhost.net {
+ *         incoming {
+ *             mask *@127.0.0.1;
+ *         };
+ *         password "mypassword";
+ *         class servers;
  *     };
  *     ulines { services.localhost.net; };
- *     listen 127.0.0.1:7000;
  */
 uplink
 {
@@ -205,7 +209,7 @@ serverinfo
 	name = "services.localhost.net"
 
 	/*
-	 * The text which should appear as the server's information in /whois and similar
+	 * The text which should appear as the server's information in /WHOIS and similar
 	 * queries.
 	 */
 	description = "Services for IRC Networks"
@@ -252,6 +256,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
+ *  - inspircd3
  *  - ngircd
  *  - plexus
  *  - ratbox
@@ -500,7 +505,7 @@ options
 	#hidestatso = yes
 
 	/*
-	 * A space-separated list of ulined servers on your network, it is assumed that
+	 * A space-separated list of U-lined servers on your network, it is assumed that
 	 * the servers in this list are allowed to set channel modes and Services will
 	 * not attempt to reverse their mode changes.
 	 *
@@ -535,11 +540,11 @@ options
 	#regexengine = "regex/pcre"
 
 	/*
-	 * A list of languages to load on startup that will be available in /nickserv set language.
+	 * A list of languages to load on startup that will be available in /NICKSERV SET LANGUAGE.
 	 * Useful if you translate Anope to your language. (Explained further in docs/LANGUAGE).
-	 * Note that english should not be listed here because it is the base language.
+	 * Note that English should not be listed here because it is the base language.
 	 *
-	 * Removing .UTF-8 will instead use the default encoding for the language, eg. iso-8859-1 for western European languages.
+	 * Removing .UTF-8 will instead use the default encoding for the language, e.g. iso-8859-1 for western European languages.
 	 */
 	languages = "ca_ES.UTF-8 de_DE.UTF-8 el_GR.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 hu_HU.UTF-8 it_IT.UTF-8 nl_NL.UTF-8 pl_PL.UTF-8 pt_PT.UTF-8 ru_RU.UTF-8 tr_TR.UTF-8"
 
@@ -668,19 +673,19 @@ log
 
 	/*
 	 * The source(s) to only accept log messages from. Leave commented to allow all sources.
-	 * This can be a users name, a channel name, one of our clients (eg, OperServ), or a server name.
+	 * This can be a users name, a channel name, one of our clients (e.g. OperServ), or a server name.
 	 */
 	#source = ""
 
 	/*
-	 * The bot used to log generic messages which have no predefined sender if there
-	 * is a channel in the target directive.
+	 * The bot used to log generic messages which have no predefined sender if the
+	 * target directive is set to a channel or globops.
 	 */
 	bot = "Global"
 
 	/*
-	 * The number of days to keep logfiles, only useful if you are logging to a file.
-	 * Set to 0 to never delete old logfiles.
+	 * The number of days to keep log files, only useful if you are logging to a file.
+	 * Set to 0 to never delete old log files.
 	 *
 	 * Note that Anope must run 24 hours a day for this feature to work correctly.
 	 */
@@ -705,7 +710,7 @@ log
 	 * means "* ~operserv/*" would log everything because * matches everything.
 	 *
 	 * Valid admin, override, and command options are:
-	 *    pesudo-serv/commandname (eg, operserv/akill, chanserv/set)
+	 *    pesudo-serv/commandname (e.g. operserv/akill, chanserv/set)
 	 *
 	 * Valid server options are:
 	 *    connect, quit, sync, squit
@@ -736,6 +741,7 @@ log
  */
 log
 {
+	bot = "Global"
 	target = "globops"
 	admin = "global/* operserv/chankill operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/oline operserv/set operserv/svsnick operserv/svsjoin operserv/svspart nickserv/getpass */drop"
 	servers = "squit"
@@ -762,17 +768,18 @@ log
  *  chanserv/administration       - Can modify the settings of any channel (including changing of the owner!)
  *  chanserv/access/list          - Can view channel access and akick lists, but not modify them
  *  chanserv/access/modify        - Can modify channel access and akick lists, and use /chanserv enforce
- *  chanserv/auspex               - Can see any information with /chanserv info
+ *  chanserv/auspex               - Can see any information with /CHANSERV INFO
  *  chanserv/no-register-limit    - May register an unlimited number of channels and nicknames
  *  chanserv/kick                 - Can kick and ban users from channels through ChanServ
- *  memoserv/info                 - Can see any information with /memoserv info
+ *  memoserv/info                 - Can see any information with /MEMOSERV INFO
  *  memoserv/set-limit            - Can set the limit of max stored memos on any user and channel
  *  memoserv/no-limit             - Can send memos through limits and throttles
  *  nickserv/access               - Can modify other users access and certificate lists
  *  nickserv/alist                - Can see the channel access list of other users
- *  nickserv/auspex               - Can see any information with /nickserv info
+ *  nickserv/auspex               - Can see any information with /NICKSERV INFO
  *  nickserv/confirm              - Can confirm other users nicknames
  *  nickserv/drop                 - Can drop other users nicks
+ *  nickserv/recover              - Can recover other users nicks
  *  operserv/config               - Can modify services's configuration
  *  operserv/oper/modify          - Can add and remove operators with at most the same privileges
  *  protected                     - Can not be kicked from channels by Services
@@ -812,6 +819,9 @@ log
  * These can contain commands for oper-only strings (see above) which grants access to that specific command,
  * and privileges (which grant access to more general permissions for the named area).
  * Wildcard entries are permitted for both, e.g. 'commands = "operserv/*"' for all OperServ commands.
+ * You can also negate values with a ~. For example, "~operserv/akill operserv/*" would allow all OperServ
+ * commands except for operserv/akill. Note that processing stops at the first matching option, which
+ * means "* ~operserv/*" would allow everything because * matches everything.
  *
  * Below are some default example types, but this is by no means exhaustive,
  * and it is recommended that you configure them to your needs.
@@ -894,7 +904,7 @@ opertype
 	 */
 	require_oper = yes
 
-	/* An optional password. If defined the user must login using "/msg OperServ LOGIN" first */
+	/* An optional password. If defined, the user must login using "/OPERSERV LOGIN" first */
 	#password = "secret"
 
 	/* An optional SSL fingerprint. If defined, it's required to be able to use this opertype. */
@@ -984,6 +994,11 @@ mail
 
 	/*
 	 * The subject and message of emails sent to users when they register accounts.
+	 *
+	 * Available tokens for this template are:
+	 *  %n - Gets replaced with the nickname
+	 *  %N - Gets replaced with the network name
+	 *  %c - Gets replaced with the confirmation code
 	 */
 	registration_subject = "Nickname registration for %n"
 	registration_message = "Hi,
@@ -997,6 +1012,11 @@ mail
 
 	/*
 	 * The subject and message of emails sent to users when they request a new password.
+	 *
+	 * Available tokens for this template are:
+	 *  %n - Gets replaced with the nickname
+	 *  %N - Gets replaced with the network name
+	 *  %c - Gets replaced with the confirmation code
 	 */
 	reset_subject = "Reset password request for %n"
 	reset_message = "Hi,
@@ -1010,6 +1030,13 @@ mail
 
 	/*
 	 * The subject and message of emails sent to users when they request a new email address.
+	 *
+	 * Available tokens for this template are:
+	 *  %e - Gets replaced with the old email address
+	 *  %E - Gets replaced with the new email address
+	 *  %n - Gets replaced with the nickname
+	 *  %N - Gets replaced with the network name
+	 *  %c - Gets replaced with the confirmation code
 	 */
 	emailchange_subject = "Email confirmation"
 	emailchange_message = "Hi,
@@ -1023,6 +1050,13 @@ mail
 
 	/*
 	 * The subject and message of emails sent to users when they receive a new memo.
+	 *
+	 * Available tokens for this template are:
+	 *  %n - Gets replaced with the nickname
+	 *  %s - Gets replaced with the sender's nickname
+	 *  %d - Gets replaced with the memo number
+	 *  %t - Gets replaced with the memo text
+	 *  %N - Gets replaced with the network name
 	 */
 	memo_subject = "New memo"
 	memo_message = "Hi %n,
@@ -1162,7 +1196,7 @@ module
 /*
  * db_redis.
  *
- * This module allows using Redis (http://redis.io) as a database backend.
+ * This module allows using Redis (https://redis.io/) as a database backend.
  * This module requires that m_redis is loaded and configured properly.
  *
  * Redis 2.8 supports keyspace notifications which allows Redis to push notifications

data/irc2sql.example.conf

@@ -18,7 +18,7 @@ service
 	/*
 	 * The hostname of the StatServ client.
 	 */
-	host = "services.host"
+	host = "stats.host"
 
 	/*
 	 * The realname of the StatServ client.
@@ -45,7 +45,7 @@ service
 	 *
 	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
 	 */
-	#channels = "@#services,#mychan"
+	#channels = "@#stats,#mychan"
 }
 
 module
@@ -58,7 +58,7 @@ module
 	 */
 	client = "StatServ"
 
-	/* 
+	/*
 	 * The name of the SQL engine to use.
 	 * This must be MySQL and must match the name in the mysql{} block
 	 */
@@ -84,7 +84,7 @@ module
 	/*
 	 * Get the CTCP version from users
 	 * The users connecting to the network will receive a CTCP VERSION
-	 * request from the above configured services client
+	 * request from the above configured stats client
 	 */
 	ctcpuser = "yes"
 
@@ -95,4 +95,3 @@ module
 	 */
 	ctcpeob = "yes"
 }
-

data/modules.example.conf

@@ -30,7 +30,7 @@ module { name = "help" }
 
 	/*
 	 * The nameserver to use for resolving hostnames, must be an IP or a resolver configuration file.
-	 * The below should work fine on all unix like systems. Windows users will have to find their nameservers
+	 * The below should work fine on all UNIX-like systems. Windows users will have to find their nameservers
 	 * from ipconfig /all and put the IP here.
 	 */
 	nameserver = "/etc/resolv.conf"
@@ -127,7 +127,7 @@ module { name = "help" }
 		 * %r is the reply reason (configured below). Will be nothing if not configured.
 		 * %N is the network name set in networkinfo:networkname
 		 */
-		reason = "You are listed in the efnet RBL, visit http://rbl.efnetrbl.org/?i=%i for info"
+		reason = "You are listed in the EFnet RBL, visit https://rbl.efnetrbl.org/?i=%i for info"
 
 		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		reply
@@ -171,7 +171,7 @@ module { name = "help" }
 	{
 		name = "dnsbl.dronebl.org"
 		time = 4h
-		reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded?ip=%i&network=%N"
+		reason = "You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup_branded?ip=%i&network=%N"
 	}
 
 	/* Exempt localhost from DNSBL checks */
@@ -223,8 +223,9 @@ module { name = "help" }
 		 * extforward_headers set below, set this to its IP.
 		 * This allows services to obtain the real IP of users by
 		 * reading the forwarded-for HTTP header.
+		 * Multiple IP addresses can be specified separated by a space character.
 		 */
-		#extforward_ip = "192.168.0.255"
+		#extforward_ip = "192.168.0.255 192.168.1.255"
 
 		/* The header to look for. These probably work as is. */
 		extforward_header = "X-Forwarded-For Forwarded-For"
@@ -298,18 +299,18 @@ module { name = "help" }
 	password_attribute = "userPassword"
 
 	/*
-	 * If set, the reason to give the users who try to register with nickserv,
+	 * If set, the reason to give the users who try to register with NickServ,
 	 * including nick registration from grouping.
 	 *
 	 * If not set, then registration is not blocked.
 	 */
-	#disable_register_reason = "To register on this network visit http://some.misconfigured.site/register"
+	#disable_register_reason = "To register on this network visit https://some.misconfigured.site/register"
 
 	/*
 	 * If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
 	 * If not set, then email changing is not blocked.
 	 */
-	#disable_email_reason = "To change your email address visit http://some.misconfigured.site"
+	#disable_email_reason = "To change your email address visit https://some.misconfigured.site"
 }
 
 /*
@@ -373,6 +374,7 @@ module { name = "help" }
 		port = 3306
 	}
 }
+
 /*
  * m_redis
  *
@@ -437,7 +439,7 @@ module { name = "help" }
 	rewrite_source = "CLEAR $ USERS"
 
 	/*
-	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
+	 * Message to rewrite the source message to. A $ followed by a number, e.g. $0, gets
 	 * replaced by the number-th word from the source_message, starting from 0.
 	 */
 	rewrite_target = "KICK $1 *"
@@ -548,7 +550,7 @@ module { name = "m_sasl" }
  * This module provides SSL services to Anope using GnuTLS, for example to
  * connect to the uplink server(s) via SSL.
  *
- * You may only load either m_ssl_gnutls or m_ssl_openssl, bot not both.
+ * You may only load either m_ssl_gnutls or m_ssl_openssl, but not both.
  */
 #module
 {
@@ -586,7 +588,7 @@ module { name = "m_sasl" }
  * This module provides SSL services to Anope using OpenSSL, for example to
  * connect to the uplink server(s) via SSL.
  *
- * You may only load either m_ssl_openssl or m_ssl_gnutls, bot not both.
+ * You may only load either m_ssl_openssl or m_ssl_gnutls, but not both.
  *
  */
 #module
@@ -655,13 +657,13 @@ module { name = "m_sasl" }
 	 * If set, the reason to give the users who try to "/msg NickServ REGISTER".
 	 * If not set, then registration is not blocked.
 	 */
-	#disable_reason = "To register on this network visit http://some.misconfigured.site/register"
+	#disable_reason = "To register on this network visit https://some.misconfigured.site/register"
 
 	/*
 	 * If set, the reason to give the users who try to "/msg NickServ SET EMAIL".
 	 * If not set, then email changing is not blocked.
 	 */
-	#disable_email_reason = "To change your email address visit http://some.misconfigured.site"
+	#disable_email_reason = "To change your email address visit https://some.misconfigured.site"
 }
 
 /*

data/nickserv.example.conf

@@ -97,9 +97,10 @@ module
 	 * -     ns_secure: Enable nickname security, requiring the nick's password before any operations
 	 *                    can be done on it
 	 * -    ns_private: Hide the nick from NickServ's LIST command
-	 * -    hide_email: Hide's the nick's e-mail address from NickServ's INFO command
-	 * -     hide_mask: Hide's the nick's last or current user@host from NickServ's INFO command
-	 * -     hide_quit: Hide's the nick's last quit message
+	 * -    hide_email: Hide the nick's e-mail address from NickServ's INFO command
+	 * -     hide_mask: Hide the nick's last or current user@host from NickServ's INFO command
+	 * -   hide_status: Hide the nick's services operator access status from NickServ's INFO command
+	 * -     hide_quit: Hide the nick's last quit message from NickServ's INFO command
 	 * -   memo_signon: Notify user if they have a new memo when they sign into the nick
 	 * -  memo_receive: Notify user if they have a new memo as soon as it's received
 	 * -     memo_mail: Notify user if they have a new memo by mail
@@ -457,7 +458,7 @@ module
 	 * If set, Services will svsnick and svsjoin users who use the recover
 	 * command on an identified user to the nick and channels of the recovered user.
 	 *
-	 * This directive is opional.
+	 * This directive is optional.
 	 */
 	restoreonrecover = yes
 }

data/operserv.example.conf

@@ -159,7 +159,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
  *
  * Provides the command operserv/defcon.
  *
- * Allows you to set services in defcon mode, which can be used to restrict services access
+ * Allows you to set services in DefCon mode, which can be used to restrict services access
  * during bot attacks.
  */
 #module
@@ -511,11 +511,11 @@ command { service = "OperServ"; name = "NOOP"; command = "operserv/noop"; permis
  *
  * Provides the command operserv/oline.
  *
- * Used to set oper flags on users, and is specific to UnrealIRCd.
+ * Used to set oper flags on users, and is specific to UnrealIRCd 3.2.
  * See /helpop ?svso on your IRCd for more information.
  */
-module { name = "os_oline" }
-command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }
+#module { name = "os_oline" }
+#command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }
 
 /*
  * os_oper
@@ -592,7 +592,7 @@ module
 	 *
 	 * This directive is optional, if not set, nothing will be sent.
 	 */
-	#sessionlimitdetailsloc = "Please visit http://your.website.url/ for more information about session limits."
+	#sessionlimitdetailsloc = "Please visit https://your.website.url/ for more information about session limits."
 
 	/*
 	 * If set and is not 0, this directive tells Services to add an AKILL if the number of subsequent kills

data/stats.standalone.example.conf

@@ -80,17 +80,17 @@
  * [OPTIONAL] Defines
  *
  * You can define values to other values, which can be used to easily change
- * many values in the configuration. at once.
+ * many values in the configuration at once.
  */
 
 /*
- * The services.host define is used in multiple different locations throughout the
- * configuration for services clients hostnames.
+ * The stats.host define is used in multiple different locations throughout the
+ * configuration for the stats client hostname.
  */
 define
 {
-	name = "services.host"
-	value = "services.localhost.net"
+	name = "stats.host"
+	value = "stats.localhost.net"
 }
 
 /*
@@ -110,7 +110,7 @@ define
 #include
 {
 	type = "executable"
-	name = "/usr/bin/wget -q -O - http://some.misconfigured.network.com/services.conf"
+	name = "/usr/bin/wget -q -O - https://some.misconfigured.network.com/stats.conf"
 }
 
 /*
@@ -126,30 +126,34 @@ define
  * An example configuration for InspIRCd that is compatible with the below uplink
  * and serverinfo configuration would look like:
  *
- *     <link name="services.localhost.net"
+ *     # This goes in inspircd.conf, *NOT* your Anope config!
+ *     <link name="stats.localhost.net"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
+ *     <uline server="stats.localhost.net" silent="yes">
  *     <bind address="127.0.0.1" port="7000" type="servers">
  *
  * An example configuration for UnrealIRCd that is compatible with the below uplink
  * and serverinfo configuration would look like:
  *
- *     link services.localhost.net
- *     {
- *          username *;
- *          hostname *;
- *          bind-ip "127.0.0.1";
- *          port 7000;
- *          hub *;
- *          password-connect "mypassword";
- *          password-receive "mypassword";
- *          class servers;
+ *     // This goes in unrealircd.conf, *NOT* your Anope config!
+ *     listen {
+ *         ip 127.0.0.1;
+ *         port 7000;
+ *         options {
+ *             serversonly;
+ *         };
  *     };
- *     ulines { services.localhost.net; };
- *     listen 127.0.0.1:7000;
+ *     link stats.localhost.net {
+ *         incoming {
+ *             mask *@127.0.0.1;
+ *         };
+ *         password "mypassword";
+ *         class servers;
+ *     };
+ *     ulines { stats.localhost.net; };
  */
 uplink
 {
@@ -205,7 +209,7 @@ serverinfo
 	name = "stats.localhost.net"
 
 	/*
-	 * The text which should appear as the server's information in /whois and similar
+	 * The text which should appear as the server's information in /WHOIS and similar
 	 * queries.
 	 */
 	description = "Stats for IRC Networks"
@@ -231,13 +235,13 @@ serverinfo
 	 * The filename containing the Services process ID. The path is relative to the
 	 * services root directory.
 	 */
-	pid = "data/services.pid"
+	pid = "data/stats.pid"
 
 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/services.motd"
+	motd = "conf/stats.motd"
 }
 
 /*
@@ -252,10 +256,12 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
+ *  - inspircd3
  *  - ngircd
  *  - plexus
  *  - ratbox
- *  - unreal
+ *  - unreal (for 3.2.x)
+ *  - unreal4
  */
 module
 {
@@ -378,7 +384,7 @@ options
 	#hidestatso = yes
 
 	/*
-	 * A space-separated list of ulined servers on your network, it is assumed that
+	 * A space-separated list of U-lined servers on your network, it is assumed that
 	 * the servers in this list are allowed to set channel modes and Services will
 	 * not attempt to reverse their mode changes.
 	 *
@@ -411,17 +417,17 @@ log
 	 */
 	target = "stats.log"
 
-	/* Log to both services.log and the channel #services
+	/* Log to both stats.log and the channel #stats
 	 *
 	 * Note that some older IRCds, such as Ratbox, require services to be in the
 	 * log channel to be able to message it. To do this, configure service:channels to
 	 * join your logging channel.
 	 */
-	#target = "stats.log #services"
+	#target = "stats.log #stats"
 
 	/*
 	 * The source(s) to only accept log messages from. Leave commented to allow all sources.
-	 * This can be a users name, a channel name, one of our clients (eg, OperServ), or a server name.
+	 * This can be a users name, a channel name, one of our clients (e.g. OperServ), or a server name.
 	 */
 	#source = ""
 
@@ -432,8 +438,8 @@ log
 	bot = "Global"
 
 	/*
-	 * The number of days to keep logfiles, only useful if you are logging to a file.
-	 * Set to 0 to never delete old logfiles.
+	 * The number of days to keep log files, only useful if you are logging to a file.
+	 * Set to 0 to never delete old log files.
 	 *
 	 * Note that Anope must run 24 hours a day for this feature to work correctly.
 	 */
@@ -461,7 +467,7 @@ log
 	 *    create, destroy, join, part, kick, leave, mode
 	 *
 	 * Valid user options are:
-	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper
+	 *    connect, disconnect, quit, nick, ident, host, mode, maxusers, oper, away
 	 *
 	 * Rawio and debug are simple yes/no answers, there are no types for them.
 	 *
@@ -510,4 +516,3 @@ include
 	type = "file"
 	name = "irc2sql.example.conf"
 }
-

docs/BUGS

@@ -1 +1 @@
-For all bug reports / updates please see http://bugs.anope.org
+For all bug reports / updates please see https://bugs.anope.org/

docs/C++CASTING

@@ -100,12 +100,12 @@ Links
 The following links are web sites I've used to get this information, and might
 describe some of the above a bit better than I have. :P
 
-http://www.acm.org/crossroads/xrds3-1/ovp3-1.html
+https://www.acm.org/crossroads/xrds3-1/ovp3-1.html
 http://www.cplusplus.com/doc/tutorial/typecasting.html
 http://www.codeguru.com/forum/showthread.php?t=312456
-http://www.cs.umd.edu/class/sum2003/cmsc311/Notes/BitOp/cast.html
-http://msdn.microsoft.com/en-us/library/5f6c9f8h(VS.80).aspx
-http://en.wikibooks.org/wiki/C%2B%2B_Programming/Type_Casting
-http://www.informit.com/guides/content.aspx?g=cplusplus&seqNum=134
+https://web.archive.org/web/20170810222238/http://www.cs.umd.edu/class/sum2003/cmsc311/Notes/BitOp/cast.html
+https://www.microsoft.com/en-us/download/details.aspx?id=55984
+https://en.wikibooks.org/wiki/C%2B%2B_Programming/Type_Casting
+https://web.archive.org/web/20160510114447/http://www.informit.com/guides/content.aspx?g=cplusplus&seqNum=134
 
 -- CyberBotX, Nov 23, 2008

docs/CODING

@@ -1,4 +1,4 @@
-Originally pulled from: http://www.inspircd.org/wiki/Coding_Guidelines
+Originally pulled from: https://wiki.inspircd.org/Coding_Guidelines
 
 ---
 

docs/Changes

@@ -1,3 +1,17 @@
+Anope Version 2.0.7
+-------------------
+Fix not sending login data on successful NickServ GROUP
+Fix m_httpd to not consider headers to be case sensitive
+Add InspIRCd 3 protocol support
+Add 'n' email token for use in the email change template
+Add logging for NickServ UNGROUP
+Fix setting swhois on UnrealIRCd
+Add nickserv/recover permission to allow opers to recover other users
+Fix superadmin not being removed when deopering
+Fix setting nickserv access list in webcpanel
+Add support for post-handshake SASL in Unreal 4.2.2+
+Add logging for channel memo deletionso
+
 Anope Version 2.0.6
 -------------------
 Log client IP for web clients running commands via webcpanel

docs/Changes.conf

@@ -1,3 +1,9 @@
+Anope Version 2.0.7
+-------------------
+Add nickserv/recover permission
+Add inspircd3 protocol module
+Add default permission for chanstats saset chanstats command
+
 Anope Version 2.0.6
 -------------------
 Mark enc_md5 and enc_sha1 as deprecated. Their use has been discouraged for years, and they will be removed in a future release.

docs/FAQ

@@ -1,10 +1,10 @@
 Frequently Asked Questions (FAQ) concerning Anope
 -------------------------------------------------
 
-The information in the 1.9 FAQ is subject to change at any
+The information in the 2.0 FAQ is subject to change at any
 moment due to new developments. Please visit our website
 for the most up to date information.
 
 An updated version of the FAQ can be found here:
 
-http://wiki.anope.org/index.php/FAQ
+https://wiki.anope.org/index.php/2.0/FAQ

docs/INSTALL

@@ -19,7 +19,7 @@ Note: You should also read the README and FAQ files!
     The very first thing you need to do is to get the Anope package (if not
     already done). You can find it at:
 
-        http://www.anope.org/
+        https://www.anope.org/
 
     Anope requires cmake to build. You can check if CMake is already
     installed on your system using the command:
@@ -32,7 +32,7 @@ Note: You should also read the README and FAQ files!
     CMake unless you install it yourself into your home directory. CMake
     can be downloaded from:
 
-        http://www.cmake.org/cmake/resources/software.html
+        https://cmake.org/download/
 
     Next, unpack the package in your home directory, and go into the created
     directory.
@@ -59,7 +59,7 @@ Note: You should also read the README and FAQ files!
     the file carefully. Using the default values is NOT a good idea, and will
     most likely not work!
 
-    If you need help, you should visit http://forum.anope.org/ or #anope on
+    If you need help, you should visit https://forum.anope.org/ or #anope on
     irc.anope.org. Provide *complete* error output, along with other relevant
     information eg. OS, compiler and C++ library versions.
     See the README file for more information.
@@ -90,7 +90,7 @@ Note: You should also read the README and FAQ files!
 
     You may also try our interactive link maker, which is located at:
 
-        http://anope.org/ilm.php
+        https://www.anope.org/ilm.php
 
 4) Starting Anope
 

docs/INSTALL.fr

@@ -19,7 +19,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     La première chose que vous devez faire est d'obtenir le package Anope
     (si ce n'est déjà fait). Vous pouvez le trouver ici :
 
-        http://www.anope.org/
+        https://www.anope.org/
 
     Anope nécessite cmake pour être compilé. Vous pouvez vérifier si CMake
     est déjà installé sur votre système avec la commande :
@@ -32,7 +32,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     pourrez pas utiliser CMake à moins de l'installer vous-même dans votre
     répertoire home. CMake peut être téléchargé ici :
 
-        http://www.cmake.org/cmake/resources/software.html
+        https://cmake.org/download/
 
     Ensuite, décompressez le package dans votre répertoire home, et allez
     dans le répértoire qui vient d'être créé.
@@ -64,7 +64,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     recommandée, et Anope ne fonctionnera probablement pas !
 
     Si vous avez besoin d'aide, vous pouvez aller sur le site
-    http://forum.anope.org/ ou le canal #anope sur irc.anope.org.
+    https://forum.anope.org/ ou le canal #anope sur irc.anope.org.
     Fournissez *l'essemble* des erreurs qui apparaîssent, en plus de
     toutes informations utiles, comme les versions de votre OS, du
     compilateur utilisé et de la librairie C++. Lisez le fichier README
@@ -99,7 +99,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     Vous pouvez également essayer notre créateur de bloc link interactif
     situé ici :
 
-        http://anope.org/ilm.php
+        https://www.anope.org/ilm.php
 
 4) Mettre en route Anope
 

docs/LANGUAGE

@@ -22,13 +22,13 @@ Anope Mutli Language Support
 
 2) Adding a new language
 
-    Anope uses gettext (http://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
+    Anope uses gettext (https://www.gnu.org/software/gettext/) to translate messages for users. To add a new language
     install gettext and run `msginit -l language -o anope.language.po -i anope.pot`. For example if I was translating to
     Spanish I could run `msginit -l es_ES -o anope.es_ES.po -i anope.pot`. Open the newly generating .po file and start
     translating. Once you are done simply rerun ./Config; make && make install and add the language to your services.conf.
     Note that on Windows it is not quite this simple, windows.cpp must be edited and Anope recompiled and restarted.
 
-    Poedit (http://www.poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
+    Poedit (https://poedit.net/) is a popular po file editor, and we recommend using it or another editor designed to edit
     po files (especially on Windows).
 
     If you have finished a language file translation and you want others to use it, please send it to team@anope.org

docs/MODULES

@@ -87,7 +87,7 @@ Anope Modules
 
 5) More Modules
 
-    You can download more useful modules from http://modules.anope.org/. Just
+    You can download more useful modules from https://modules.anope.org/. Just
     grab the module file (usually with a .cpp extension). Place the module
     file in your modules (anope-1.9.x/modules/third) folder; although any of
     the other folders within the modules directory will work.
@@ -118,11 +118,11 @@ Anope Modules
     There are a number of useful documents on the Anope Wiki. The Anope Wiki
     can be reached at:
 
-    * http://wiki.anope.org/
+    * https://wiki.anope.org/
 
 8) Modules Repository
 
-    You can find modules at http://modules.anope.org
+    You can find modules at https://modules.anope.org/
 
     These modules are 3rd party and as such are not supported by the Anope Team.
     Contact the Module Author directly with problems, not the Anope Team.

docs/README

@@ -1,14 +1,14 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2017 Anope Team    <team@anope.org>.
+Anope is          2003-2019 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
 This program is free but copyrighted software; see the file COPYING for
 details.
 
-Information about Anope may be found at http://www.anope.org/
+Information about Anope may be found at https://www.anope.org/
 
 Table of Contents
 -----------------
@@ -169,7 +169,7 @@ Table of Contents
         * Bahamut 1.4.27 or later (including 1.8)
         * Charybdis 3.4 or later
         * Hybrid 8.2 or later
-        * InspIRCd 1.2 or 2.0
+        * InspIRCd 1.2 or later
         * ngIRCd 19.2 or later
         * Plexus 3 or later
         * Ratbox 2.0.6 or later
@@ -240,7 +240,7 @@ Table of Contents
 6) Contact
 
     For announcements and discussions about Anope, please visit our
-    Portal and Forums at http://www.anope.org/ -- make sure you register
+    Portal and Forums at https://www.anope.org/ -- make sure you register
     yourself to get full benefits.
 
     If you read the documentation carefully, and didn't find the answer to
@@ -252,7 +252,7 @@ Table of Contents
     The more precise you are the sooner you'll be likely to get an answer.
 
     If you think you found a bug, add it to the bug tracking system
-    (http://bugs.anope.org) and - again - be as precise as possible. Also say
+    (https://bugs.anope.org/) and - again - be as precise as possible. Also say
     whether the bug happens always or under what circumstances, and anything
     that could be useful to track your bug down. If you wrote a patch, send
     it over. :)

docs/REDIS

@@ -1,8 +1,8 @@
-Starting in Anope 1.9.9, Anope has Redis database support (http://redis.io/).
+Starting in Anope 1.9.9, Anope has Redis database support (https://redis.io/).
 This document explains the data structure used by Anope, and explains how
 keyspace notification works.
 
-This is not a tutorial on how to use Redis, see http://redis.io/documentation
+This is not a tutorial on how to use Redis, see https://redis.io/documentation
 for that.
 
 Table of Contents
@@ -70,7 +70,7 @@ Table of Contents
 2) Keyspace notifications
 
     Redis 2.7 (unstable) and 2.8 (stable) and newer support keyspace notifications
-    (http://redis.io/topics/notifications). This allows Redis to notify Anope of
+    (https://redis.io/topics/notifications). This allows Redis to notify Anope of
     any external changes to objects in the database. Once notified, Anope will
     immediately update the object. Otherwise, Anope keeps all objects in memory
     and will not regularly read from the databaes once started.

docs/WIN32.txt

@@ -18,10 +18,10 @@ Anope for Windows
     1) Download the required files:
 
         * Current Anope source:
-            http://sourceforge.net/project/showfiles.php?group_id=94081
+            https://github.com/anope/anope/releases
 
         * CMake:
-            http://www.cmake.org/cmake/resources/software.html
+            https://cmake.org/download/
 
         (NOTE: When installing, tell CMake to add itself to the PATH.)
 

docs/XMLRPC/xmlrpc.php

@@ -3,7 +3,7 @@
 /**
  * XMLRPC Functions
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  */
 

extras

@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 #
-# Script taken from InspIRCd, www.inspircd.org
+# Script taken from InspIRCd, https://www.inspircd.org/
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -9,7 +9,7 @@
 # details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
 

include/CMakeLists.txt

@@ -1,16 +1,16 @@
 # Set version.cpp to use C++ as well as set its compile flags
 set_source_files_properties(version.cpp PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}")
-# Generate version executable to modify version.h, setting it's linker flags as well
-add_executable(version version.cpp)
-set_target_properties(version PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
-get_target_property(version_BINARY version LOCATION)
+# Generate version-bin executable to modify version.h, setting it's linker flags as well
+add_executable(version-bin version.cpp)
+set_target_properties(version-bin PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
+get_target_property(version_BINARY version-bin LOCATION)
 # Modify version.h from the above executable, with dependencies to version.cpp
 # and all of the source files in the main build
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_build
   COMMAND ${version_BINARY} ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
-  DEPENDS version ${SRC_SRCS}
+  DEPENDS version-bin ${SRC_SRCS}
 )
-# Add version to list of files for CPack to ignore
+# Add version-bin to list of files for CPack to ignore
 get_filename_component(version_BINARY ${version_BINARY} NAME)
 add_to_cpack_ignored_files("${version_BINARY}$" TRUE)
 if(NOT WIN32)
@@ -61,4 +61,4 @@ if(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 endif(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})
+add_custom_target(headers DEPENDS version-bin ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})

include/access.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/account.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/anope.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/base.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2019 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/bots.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2019 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/config.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/defs.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/extensible.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/hashcomp.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2002-2011 InspIRCd Development Team
- * (C) 2009-2017 Anope Team <team@anope.org>
+ * (C) 2009-2019 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/language.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/lists.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/logger.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/mail.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/memo.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/messages.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modes.h

@@ -1,7 +1,7 @@
 /* Mode support
  *
  * (C) 2008-2011 Adam <Adam@anope.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2019 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -192,7 +192,7 @@ class CoreExport ChannelModeStatus : public ChannelMode
 	/* The "level" of the mode, used to compare with other modes.
 	 * Used so we know op > halfop > voice etc.
 	 */
-	short level;
+	unsigned level;
 
 	/** constructor
 	 * @param name The mode name
@@ -200,7 +200,7 @@ class CoreExport ChannelModeStatus : public ChannelMode
 	 * @param msymbol The symbol for the mode, eg @ %
 	 * @param mlevel A level for the mode, which is usually determined by the PREFIX capab
 	 */
-	ChannelModeStatus(const Anope::string &name, char mc, char msymbol, short mlevel);
+	ChannelModeStatus(const Anope::string &name, char mc, char msymbol, unsigned mlevel);
 };
 
 /** A virtual mode. This mode doesn't natively exist on the IRCd (like extbans),

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_badwords.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/bs_kick.h

@@ -1,6 +1,6 @@
 /* BotServ core functions
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_entrymsg.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/cs_mode.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/dns.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/encryption.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/httpd.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2012-2017 Anope Team
+ * (C) 2012-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -23,7 +23,7 @@ struct HTTPReply
 {
 	HTTPError error;
 	Anope::string content_type;
-	std::map<Anope::string, Anope::string> headers;
+	std::map<Anope::string, Anope::string, ci::less> headers;
 	typedef std::list<std::pair<Anope::string, Anope::string> > cookie;
 	std::vector<cookie> cookies;
 
@@ -141,7 +141,7 @@ class HTTPProvider : public ListenSocket, public Service
 	unsigned short port;
 	bool ssl;
  public:
-	Anope::string ext_ip;
+	std::vector<Anope::string> ext_ips;
 	std::vector<Anope::string> ext_headers;
 
 	HTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, bool s) : ListenSocket(i, p, i.find(':') != Anope::string::npos), Service(c, "HTTPProvider", n), ip(i), port(p), ssl(s) { }

include/modules/ldap.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ns_cert.h

@@ -1,6 +1,6 @@
 /* NickServ core functions
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_forbid.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_ignore.h

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_news.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/os_session.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/chanserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/global.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/memoserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/pseudoclients/nickserv.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2011-2017 Anope Team
+ * (C) 2011-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/redis.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sasl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2014-2017 Anope Team
+ * (C) 2014-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/set_misc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/sql.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/ssl.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2017 Anope Team
+ * (C) 2010-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/suspend.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/modules/xmlrpc.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2010-2017 Anope Team
+ * (C) 2010-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/opertype.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2008-2017 Anope Team <team@anope.org>
+ * (C) 2008-2019 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */

include/protocol.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -39,7 +39,7 @@ class CoreExport IRCDProto : public Service
 	virtual void SendNumericInternal(int numeric, const Anope::string &dest, const Anope::string &buf);
 
 	const Anope::string &GetProtocolName();
-	virtual void Parse(const Anope::string &, Anope::string &, Anope::string &, std::vector<Anope::string> &);
+	virtual bool Parse(const Anope::string &, Anope::map<Anope::string> &, Anope::string &, Anope::string &, std::vector<Anope::string> &);
 	virtual Anope::string Format(const Anope::string &source, const Anope::string &message);
 
 	/* Modes used by default by our clients */
@@ -278,11 +278,39 @@ class CoreExport IRCDMessage : public Service
 	IRCDMessage(Module *owner, const Anope::string &n, unsigned p = 0);
 	unsigned GetParamCount() const;
 	virtual void Run(MessageSource &, const std::vector<Anope::string> &params) = 0;
+	virtual void Run(MessageSource &, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags);
 
 	void SetFlag(IRCDMessageFlag f) { flags.insert(f); }
 	bool HasFlag(IRCDMessageFlag f) const { return flags.count(f); }
 };
 
+/** MessageTokenizer allows tokens in the IRC wire format to be read from a string */
+class CoreExport MessageTokenizer
+{
+private:
+	/** The message we are parsing tokens from. */
+	Anope::string message;
+
+	/** The current position within the message. */
+	Anope::string::size_type position;
+
+ public:
+	/** Create a tokenstream and fill it with the provided data. */
+	MessageTokenizer(const Anope::string &msg);
+
+	/** Retrieve the next \<middle> token in the message.
+	 * @param token The next token available, or an empty string if none remain.
+	 * @return True if a token was retrieved; otherwise, false.
+	 */
+	bool GetMiddle(Anope::string &token);
+
+	/** Retrieve the next \<trailing> token in the message.
+	 * @param token The next token available, or an empty string if none remain.
+	 * @return True if a token was retrieved; otherwise, false.
+	 */
+	bool GetTrailing(Anope::string &token);
+};
+
 extern CoreExport IRCDProto *IRCD;
 
 #endif // PROTOCOL_H

include/regchannel.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/regexpr.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/serialize.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/servers.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/service.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/socketengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/threadengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/timers.h

@@ -1,6 +1,6 @@
 /* Timer include stuff.
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/uplink.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/users.h

@@ -1,7 +1,7 @@
 /*
  *
  * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * (C) 2003-2017 Anope Team <team@anope.org>
+ * (C) 2003-2019 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *

include/version.cpp

@@ -1,6 +1,6 @@
 /* Build bumper
  *
- * (C) 2003-2017 Anope Team
+ * (C) 2003-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.

include/xline.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2008-2017 Anope Team
+ * (C) 2008-2019 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.