Release 2.1.0.

Closes #325.

.BANNER

@@ -1,5 +1,5 @@
    ___
-  / _ \  http://www.anope.org
+  / _ \  https://www.anope.org/
  | /_\ | _ __  _ _  _ _   ___
  |  _  || '_ \/ _ \/ _ \ / _ \
  | | | || | |  |_|  |_| |  __/
@@ -7,12 +7,13 @@
                    | |
                    |_| IRC Services
                              CURVER
-This program will help you to compile your Services, and ask you
+This program will help you to compile your services, and ask you
 questions regarding the compile-time settings of it during the
 process. For more options type SOURCE_DIR/Config --help
 
-Anope is a set of Services for IRC networks that allows users to
+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/

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Report a non-security issue with Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your bug report a lot faster.
+-->
+
+**Description**
+
+
+
+**Steps to reproduce the issue:**
+
+1.
+2.
+3.
+
+**Describe the results you received:**
+
+
+
+**Describe the results you expected:**
+
+
+
+**Additional information you deem important (e.g. issue happens only occasionally):**
+
+
+
+**Output of `services --version`:**
+

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Request that a new feature is added to Anope.
+---
+
+<!--
+Please fill in the template below. It will help us process your feature request a lot faster.
+-->
+
+**Description**
+
+
+
+**Why this would be useful**
+

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,26 @@
+<!--
+Please fill in the template below. It will help us process your pull request a lot faster.
+-->
+
+## Summary
+
+<!--
+Briefly describe what this pull request changes.
+-->
+
+## Rationale
+
+<!--
+Describe why you have made this change.
+-->
+
+## Testing Environment
+
+<!--
+Describe the environment in which you have tested this change:
+-->
+
+I have tested this pull request on:
+
+**Operating system name and version:** <!-- e.g. Linux 3.11 -->
+**Compiler name and version:** <!-- e.g. GCC 4.2.0 -->

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly

.github/workflows/ci-linux.yml

@@ -0,0 +1,47 @@
+name: Linux CI
+on:
+  - pull_request
+  - push
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    env:
+      CXX: ${{ matrix.compiler }}
+      CXXFLAGS: -Werror
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update --assume-yes
+          sudo apt-get install --assume-yes --no-install-recommends \
+            clang \
+            g++ \
+            git \
+            libgnutls28-dev \
+            libldap2-dev \
+            libmysqlclient-dev \
+            libpcre2-dev \
+            libpcre3-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtre-dev \
+            ninja-build
+      - name: Enable extras
+        run: |
+          for MODULE in m_ldap.cpp m_ldap_authentication.cpp m_ldap_oper.cpp m_mysql.cpp m_regex_pcre.cpp m_regex_pcre2.cpp m_regex_posix.cpp m_regex_tre.cpp m_sql_authentication.cpp m_sql_log.cpp m_sql_oper.cpp m_sqlite.cpp m_ssl_gnutls.cpp m_ssl_openssl.cpp stats
+          do
+            ln -s ${{ github.workspace }}/modules/extra/$MODULE ${{ github.workspace }}/modules
+          done
+      - name: Run CMake
+        run: |
+          mkdir build && cd build
+          cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=DEBUG -DINSTDIR:STRING=${{ github.workspace }}/run ..
+      - name: Build Anope
+        run: |
+          ninja -C ${{ github.workspace }}/build install
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - clang++
+          - g++

.github/workflows/ci-windows.yml

@@ -0,0 +1,34 @@
+name: Windows CI
+on:
+  pull_request:
+  push:
+  schedule:
+    - cron: '0 0 * * 0'
+jobs:
+  build:
+    runs-on: windows-2019
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.3
+
+      - name: Setup Conan
+        uses: turtlebrowser/get-conan@v1.2
+        with:
+          version: 1.59.0
+
+      - name: Install libraries
+        run: |
+          conan install ${{ github.workspace }}\src\win32 --build=missing
+
+      - name: Run CMake
+        run: |
+          mkdir ${{ github.workspace }}\build
+          cd ${{ github.workspace }}\build
+          cmake -A "x64" -G "Visual Studio 16 2019" ..
+
+      - name: Build Anope
+        working-directory: ${{ github.workspace }}\build
+        run: |
+          msbuild PACKAGE.vcxproj /M:3 /P:Configuration=Release /P:Platform=x64 /VERBOSITY:MINIMAL

.gitignore

@@ -1,3 +1,19 @@
+build/
 config.cache
 include/sysconf.h
-build/
+modules/m_ldap.cpp
+modules/m_ldap_authentication.cpp
+modules/m_ldap_oper.cpp
+modules/m_mysql.cpp
+modules/m_regex_pcre.cpp
+modules/m_regex_pcre2.cpp
+modules/m_regex_posix.cpp
+modules/m_regex_tre.cpp
+modules/m_sql_authentication.cpp
+modules/m_sql_log.cpp
+modules/m_sql_oper.cpp
+modules/m_sqlite.cpp
+modules/m_ssl_gnutls.cpp
+modules/m_ssl_openssl.cpp
+modules/stats
+run/

.mailmap

@@ -1,3 +1,4 @@
+(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Adam <adam@anope.org> <adam-@5417fbe8-f217-4b02-8779-1006273d7864>
 Adam <adam@anope.org> <adam@adam-laptop.(none)>
 Adam <adam@anope.org> <Adam@anope.org>
@@ -5,9 +6,11 @@ Adam <adam@anope.org> <Adam@drink-coca-cola.info>
 Adam <adam@anope.org> <Adam@sigterm.info>
 Adam Kramer <ribosome@anope.org> <ribosome ribosome@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Alvaro Toledo <atoledo@keldon.org> <atoledo atoledo@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Attila Molnar <attilamolnar@hush.com>
 Björn Stiddien <keeper@anope.org> <keeper keeper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Charles Kingsley <chaz@anope.org>
 Charles Kingsley <chaz@anope.org> <sjaz@5417fbe8-f217-4b02-8779-1006273d7864>
+Cronus <cronus@nite-serv.com>
 Daniel Engel <dane@zero.org> <dane dane@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 David Robson <rob@anope.org> <robbeh@5417fbe8-f217-4b02-8779-1006273d7864>
 David Robson <rob@anope.org> <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
@@ -15,6 +18,7 @@ Dennis Friis <peavey@inspircd.org> <peavey peavey@inspircd.org@5417fbe8-f217-4b0
 Fabio Scotoni <cculex@gmail.com>
 Florian Schulze <certus@anope.org> <certus certus@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Gabriel Acevedo H. <drstein@anope.org> <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Harakiri <harakiri@overstack.fr>
 Jan Milants <viper@anope.org>
 Jan Milants <viper@anope.org> <jantje_85@5417fbe8-f217-4b02-8779-1006273d7864>
 Jan Milants <viper@anope.org> <viper viper@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
@@ -23,15 +27,24 @@ Jens Voss <dukepyrolator@anope.org> <DukePyrolator@5417fbe8-f217-4b02-8779-10062
 Jens Voss <dukepyrolator@anope.org> <DukePyrolator@anope.org>
 Jens Voss <dukepyrolator@anope.org> Jens Voß <jens@pyrobook.(none)>
 Lee Holmes <lethality@anope.org>
+Lee Holmes <lethality@anope.org> <lee@lethality.me.uk>
 Mark Summers <mark@goopler.net> <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
+Matt Schatz <genius3000@g3k.solutions>
+Matt Ullman <matt@airraidsirens.com> <blindsight@gamesurge.net>
+Michael Hazell <michaelhazell@hotmail.com> <Techman-@users.noreply.github.com>
+Michael Wobst <wobst.michael@web.de>
+Michael Wobst <wobst.michael@web.de> <michael@static.163.129.251.148.clients.your-server.de>
+Michael Wobst <wobst.michael@web.de> <michael@wobst.at>
 Naram Qashat <cyberbotx@anope.org> <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
 Naram Qashat <cyberbotx@anope.org> <cyberbotx@cyberbotx.com>
 Naram Qashat <cyberbotx@anope.org> <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>
 Pieter Bootsma <geniusdex@anope.org> <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
-Robby <robby@chat.be>
+Robby <robby@chatbelgie.be> <robby@anope.org>
+Robby <robby@chatbelgie.be> <robby@chat.be>
 Robin Burchell <w00t@inspircd.org> <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>
 Robin Burchell <w00t@inspircd.org> <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
+Sadie Powell <sadie@witchery.services> Peter Powell <petpow@saberuk.com>
+Sebastian Barfurth <github@afreshmelon.com>
 Sebastian V. <hal9000@denorastats.org>
 Sebastian V. <hal9000@denorastats.org> <pimpmylinux@5417fbe8-f217-4b02-8779-1006273d7864>
-(svnadmin) <svn@localhost> <svn svn@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>
 Trystan S. Lee <trystan@nomadirc.net> <trystan trystan@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>

.travis.yml

@@ -1,16 +0,0 @@
-language: cpp
-
-compiler:
-  - gcc
-
-before_script:
-  - mkdir build
-  - cd build
-  - cmake -DINSTDIR:STRING=~/services -DDEFUMASK:STRING=077 -DCMAKE_BUILD_TYPE:STRING=DEBUG -DUSE_RUN_CC_PL:BOOLEAN=ON ..
-
-script:
-  - make
-
-notifications:
-  irc:
-    - "irc.anope.org#anope-devel"

CMakeLists.txt

@@ -1,78 +1,10 @@
-# This usage of CMake requires at least version 2.4 (checks are made to determine what to use when certain versions lack functions)
-cmake_minimum_required(VERSION 2.4 FATAL_ERROR)
-if(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 NEW)
-  if(POLICY CMP0026)
-    cmake_policy(SET CMP0026 OLD)
-  endif(POLICY CMP0026)
-  if(POLICY CMP0007)
-    cmake_policy(SET CMP0007 OLD)
-  endif(POLICY CMP0007)
-endif(COMMAND cmake_policy)
-
-# If the Source dir and the Binary dir are the same, we are building in-source, which we will disallow due to Autotools being there (but only on non-Windows)
-if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR} AND NOT WIN32)
-  message(FATAL_ERROR "You can not use CMake to build Anope from the root of it's source tree! Remove the CMakeCache.txt file from this directory, then create a separate directory (either below this directory or elsewhere), and then re-run CMake from there.")
-endif(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR} AND NOT WIN32)
+# This usage of CMake requires at least version 3.8
+cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 
 # Set the project as C++ primarily, but have C enabled for the checks required later
 project(Anope CXX)
 enable_language(C)
 
-# Detect the version of CMake for the later conditional checks
-execute_process(COMMAND ${CMAKE_COMMAND} --version OUTPUT_VARIABLE VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX REPLACE "cmake version 2\\.(.*)" "\\1" ONLY_VERSION "${VERSION}")
-string(REGEX MATCH "-patch .*$" HAS_PATCH "${ONLY_VERSION}")
-if(HAS_PATCH)
-  string(REGEX REPLACE "(.*)-patch .*" "\\1" MINOR_VERSION "${ONLY_VERSION}")
-  string(REGEX REPLACE ".*-patch (.*)" "\\1" PATCH_VERSION "${ONLY_VERSION}")
-else(HAS_PATCH)
-  string(REGEX MATCH "\\." HAS_DOT "${ONLY_VERSION}")
-  if(HAS_DOT)
-    string(REGEX REPLACE "(.*)\\..*" "\\1" MINOR_VERSION "${ONLY_VERSION}")
-    string(REGEX REPLACE ".*\\.(.*)" "\\1" PATCH_VERSION "${ONLY_VERSION}")
-  else(HAS_DOT)
-    string(REGEX REPLACE "(.*)-beta" "\\1" MINOR_VERSION "${ONLY_VERSION}")
-    if(MINOR_VERSION STREQUAL "4-1\n")
-      set(PATCH_VERSION 1)
-    else(MINOR_VERSION STREQUAL "4-1\n")
-      set(PATCH_VERSION 0)
-    endif(MINOR_VERSION STREQUAL "4-1\n")
-    set(MINOR_VERSION 4)
-  endif(HAS_DOT)
-endif(HAS_PATCH)
-
-# Detect is we are using CMake 2.6 or better, these versions include functions that require less work than CMake 2.4 does
-if(MINOR_VERSION GREATER 5)
-  set(CMAKE26_OR_BETTER TRUE)
-  set(CMAKE248_OR_BETTER TRUE)
-  set(CMAKE244_OR_BETTER TRUE)
-  set(CMAKE242_OR_BETTER TRUE)
-else(MINOR_VERSION GREATER 5)
-  set(CMAKE26_OR_BETTER FALSE)
-  # Also detect if we are using CMake 2.4.8 or better, the FIND sub-command of list() is non-existant in earlier versions
-  if(PATCH_VERSION GREATER 7)
-    set(CMAKE248_OR_BETTER TRUE)
-    set(CMAKE244_OR_BETTER TRUE)
-    set(CMAKE242_OR_BETTER TRUE)
-  else(PATCH_VERSION GREATER 7)
-    set(CMAKE248_OR_BETTER FALSE)
-    # Also detect if we are using CMake 2.4.4 or better, the CheckCXXCompilerFlag module and SORT sub-command of list() are non-existant in earlier versions
-    if(PATCH_VERSION GREATER 3)
-      set(CMAKE244_OR_BETTER TRUE)
-      set(CMAKE242_OR_BETTER TRUE)
-    else(PATCH_VERSION GREATER 3)
-      set(CMAKE244_OR_BETTER FALSE)
-      # ALSO detect if we are using CMake 2.4.2 or better, the APPEND sub-command of list() is non-existant in earlier versions
-      if(PATCH_VERSION GREATER 1)
-        set(CMAKE242_OR_BETTER TRUE)
-      else(PATCH_VERSION GREATER 1)
-        set(CMAKE242_OR_BETTER FALSE)
-      endif(PATCH_VERSION GREATER 1)
-    endif(PATCH_VERSION GREATER 3)
-  endif(PATCH_VERSION GREATER 7)
-endif(MINOR_VERSION GREATER 5)
-
 # Override the module include path to include our directory, for our Anope.cmake, as well as we are using our own version of the NSIS template
 set(CMAKE_MODULE_PATH ${Anope_SOURCE_DIR}/cmake)
 
@@ -85,8 +17,13 @@ set(ENV{LC_ALL} C)
 set(DEFAULT_LIBRARY_DIRS)
 set(DEFAULT_INCLUDE_DIRS)
 
+# We require C++17 to build
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 # If we are using a GNU compiler (have to use CXX because it seems to fail on C), we will be able to determine it's default paths for libraries and includes
-if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang$")
   # First look for the compiler's default library directories
   execute_process(COMMAND ${CMAKE_C_COMPILER} -print-search-dirs OUTPUT_VARIABLE LINES OUTPUT_STRIP_TRAILING_WHITESPACE)
   # Find only the part after "libraries: "
@@ -94,9 +31,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
   # Replace the colons in the list with semicolons (only when not on MinGW, which uses semicolons already), and if on MinGW, just copy the line
   if(NOT MINGW)
     string(REGEX REPLACE ":" ";" LIBRARIES ${LINE})
-  else(NOT MINGW)
+  else()
     set(LIBRARIES "${LINE}")
-  endif(NOT MINGW)
+  endif()
   # Iterate through the libraries
   foreach(LIBRARY ${LIBRARIES})
     # Check if the first character is an equal sign, and skip that library directory as it is (I believe) the primary default and shows up later in the list anyways
@@ -104,13 +41,13 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
     if(NOT FIRST_CHAR STREQUAL "=")
       # If the directory had no = in front of it, make sure it's absolute and add it to the list of default library directories
       get_filename_component(LIBRARY ${LIBRARY} ABSOLUTE)
-      append_to_list(DEFAULT_LIBRARY_DIRS ${LIBRARY})
-    endif(NOT FIRST_CHAR STREQUAL "=")
-  endforeach(LIBRARY)
+      list(APPEND DEFAULT_LIBRARY_DIRS ${LIBRARY})
+    endif()
+  endforeach()
   # Remove duplicate entries from the list
   if(DEFAULT_LIBRARY_DIRS)
-    remove_list_duplicates(DEFAULT_LIBRARY_DIRS)
-  endif(DEFAULT_LIBRARY_DIRS)
+    list(REMOVE_DUPLICATES DEFAULT_LIBRARY_DIRS)
+  endif()
   # Create a temporary file to test for the default include directories
   FILE(WRITE empty.cpp "")
   # Next, we look for the compiler's default include directories
@@ -127,11 +64,11 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
     # If the line has the following on it, the next lines will contain directory names
     if(LINE STREQUAL "#include <...> search starts here:")
       set(IN_SEARCH TRUE)
-    else(LINE STREQUAL "#include <...> search starts here:")
+    else()
       # If the line has the following on it, we hit the end of the list
       if(LINE STREQUAL "End of search list.")
         set(IN_SEARCH FALSE)
-      else(LINE STREQUAL "End of search list.")
+      else()
         # If we are within the block between the above two lines...
         if(IN_SEARCH)
           # Get everything but the first character of the line
@@ -143,47 +80,16 @@ if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
           # Convert the path to an absolute one, just in case it wasn't
           get_filename_component(INCLUDE ${INCLUDE} ABSOLUTE)
           # Add that directory to the list of default include directories
-          append_to_list(DEFAULT_INCLUDE_DIRS ${INCLUDE})
-        endif(IN_SEARCH)
-      endif(LINE STREQUAL "End of search list.")
-    endif(LINE STREQUAL "#include <...> search starts here:")
-  endforeach(LINE)
+          list(APPEND DEFAULT_INCLUDE_DIRS ${INCLUDE})
+        endif()
+      endif()
+    endif()
+  endforeach()
   # Remove duplicate entries from the list
   if(DEFAULT_INCLUDE_DIRS)
-    remove_list_duplicates(DEFAULT_INCLUDE_DIRS)
-  endif(DEFAULT_INCLUDE_DIRS)
-endif(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-
-# If we are using Visual Studio, locate the path of the Windows Server 2008 SDK or Windows Server 2003 Platform SDK, depending on which is installed
-if(MSVC)
-  # If the path comes up as "/registry" from any of these, the path wasn't found, otherwise, we'll set WSDK_PATH to the corresponding path
-  # Look for the 2008 SDK under HKLM first
-  get_filename_component(WSDK2008_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" ABSOLUTE CACHE)
-  if(WSDK2008_PATH STREQUAL "/registry")
-    # If not found, look for the 2003 SDK under HKLM
-    get_filename_component(WSDK2003_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\MicrosoftSDK\\InstalledSDKs\\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1;Install Dir]" ABSOLUTE CACHE)
-    if(WSDK2003_PATH STREQUAL "/registry")
-      # If not found, look for the 2008 SDK under HKCU
-      get_filename_component(WSDK2008_PATH "[HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows;CurrentInstallFolder]" ABSOLUTE CACHE)
-      if(WSDK2008_PATH STREQUAL "/registry")
-        # If not found, look for the 2003 SDK under HKCU
-        get_filename_component(WSDK2003_PATH "[HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\MicrosoftSDK\\InstalledSDKs\\D2FF9F89-8AA2-4373-8A31-C838BF4DBBE1;Install Dir]" ABSOLUTE CACHE)
-        if(WSDK2003_PATH STREQUAL "/registry")
-          # The SDK was never found, set the path to nothing
-          set(WSDK_PATH "")
-        else(WSDK2003_PATH STREQUAL "/registry")
-          set(WSDK_PATH "${WSDK2003_PATH}")
-        endif(WSDK2003_PATH STREQUAL "/registry")
-      else(WSDK2008_PATH STREQUAL "/registry")
-        set(WSDK_PATH "${WSDK2008_PATH}")
-      endif(WSDK2008_PATH STREQUAL "/registry")
-    else(WSDK2003_PATH STREQUAL "/registry")
-      set(WSDK_PATH "${WSDK2003_PATH}")
-    endif(WSDK2003_PATH STREQUAL "/registry")
-  else(WSDK2008_PATH STREQUAL "/registry")
-    set(WSDK_PATH "${WSDK2008_PATH}")
-  endif(WSDK2008_PATH STREQUAL "/registry")
-endif(MSVC)
+    list(REMOVE_DUPLICATES DEFAULT_INCLUDE_DIRS)
+  endif()
+endif()
 
 # If the user specifies -DCMAKE_BUILD_TYPE on the command line, take their definition
 # and dump it in the cache along with proper documentation, otherwise set CMAKE_BUILD_TYPE
@@ -192,57 +98,67 @@ endif(MSVC)
 if(NOT MSVC)
   if(CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
-  else(CMAKE_BUILD_TYPE)
+  else()
     set(CMAKE_BUILD_TYPE DEBUG CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
-  endif(CMAKE_BUILD_TYPE)
-endif(NOT MSVC)
+  endif()
+endif()
 
 # If running under MinGW, we have to force the resource compiler settings (hopefully this will be fixed in a later version of CMake)
 if(MINGW)
   set(CMAKE_RC_COMPILER_INIT windres)
   enable_language(RC)
   set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -o <OBJECT> <SOURCE>")
-endif(MINGW)
+endif()
 
 # Include the checking functions used later in this CMakeLists.txt
 include(CheckFunctionExists)
-include(CheckIncludeFile)
 include(CheckTypeSize)
 include(CheckLibraryExists)
-if(CMAKE244_OR_BETTER)
-  include(CheckCXXCompilerFlag)
-else(CMAKE244_OR_BETTER)
-  include(TestCXXAcceptsFlag)
-endif(CMAKE244_OR_BETTER)
+include(CheckCXXCompilerFlag)
 
 # If extra include directories were specified, tell cmake about them.
 if(EXTRA_INCLUDE)
   include_directories(${EXTRA_INCLUDE})
-endif(EXTRA_INCLUDE)
+endif()
 
 # If extra library directories were specified, tell cmake about them.
 if(EXTRA_LIBS)
   link_directories(${EXTRA_LIBS})
-endif(EXTRA_LIBS)
+endif()
+
+# setup conan
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  include("${CMAKE_CURRENT_SOURCE_DIR}/conanbuildinfo.cmake")
+  conan_basic_setup()
+endif()
 
 # Find gettext
 find_package(Gettext)
-
-# Add an optional variable for using run-cc.pl for building, Perl will be checked later regardless of this setting
-option(USE_RUN_CC_PL "Use run-cc.pl for building" OFF)
-option(USE_PCH "Use precompiled headers" OFF)
+find_package(Intl)
+if(GETTEXT_FOUND AND Intl_FOUND)
+  set(HAVE_LOCALIZATION ON)
+  include_directories(${Intl_INCLUDE_DIRS})
+else()
+  message("Unable to find gettext and libintl; disabling localization")
+  set(HAVE_LOCALIZATION OFF)
+endif()
 
 # Use the following directories as includes
-# Note that it is important the binary include directory comes before the
-# source include directory so the precompiled headers work correctly.
-include_directories(${Anope_BINARY_DIR}/include ${Anope_SOURCE_DIR}/include ${Anope_BINARY_DIR}/language ${Anope_SOURCE_DIR}/modules/pseudoclients)
+include_directories(
+  ${Anope_BINARY_DIR}/include
+  ${Anope_SOURCE_DIR}/include
+  ${Anope_SOURCE_DIR}/vendor
+)
+
+# Pass on REPRODUCIBLE_BUILD
+if(REPRODUCIBLE_BUILD)
+  add_definitions(-DREPRODUCIBLE_BUILD)
+endif()
 
-# If using Windows, always add the _WIN32 define
 if(WIN32)
-  add_definitions(-D_WIN32)
-  # And include the windows specific folder for our anope_windows.h
+  # If using Windows, include the windows specific folder for anope_windows.h
   include_directories(${Anope_SOURCE_DIR}/src/win32)
-endif(WIN32)
+endif()
 
 # If using Visual Studio, set the C++ flags accordingly
 if(MSVC)
@@ -252,105 +168,76 @@ if(MSVC)
   string(REPLACE "/W3 " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
   # Set the compile flags to have warnings on the max setting (but disable a few annoying ones), exception handling turned on, the proper defines
   set(CXXFLAGS "${CXXFLAGS} /W4 /wd4100 /wd4127 /wd4250 /wd4251 /wd4355 /wd4706 /wd4800 /wd4996 /EHs")
-  add_definitions(-DMSVCPP -D_CRT_SECURE_NO_WARNINGS)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 # Otherwise, we're not using Visual Studio
-else(MSVC)
+else()
   # Set the compile flags to have all warnings on (including shadowed variables)
-  set(CXXFLAGS "${CXXFLAGS} -Wall -Wshadow")
-  # If on a *nix system, also set the compile flags to remove GNU extensions (favor ISO C++) as well as reject non-ISO C++ code, also remove all leading underscores in exported symbols (only on GNU compiler)
-  if(UNIX)
-    set(CXXFLAGS "${CXXFLAGS} -ansi -pedantic ${CMAKE_CXX_FLAGS}")
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set(CXXFLAGS "${CXXFLAGS} -Wno-long-long -fno-leading-underscore")
-    endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  # If we aren't on a *nix system, we are using MinGW
-  else(UNIX)
-    # Also, if we are building under MinGW, add another define for MinGW
-    if(MINGW)
-      add_definitions(-DMINGW)
-    endif(MINGW)
-  endif(UNIX)
-endif(MSVC)
+  set(CXXFLAGS "${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wpedantic -Wno-unused-parameter ${CMAKE_CXX_FLAGS}")
+endif()
 
 # If CMake has found that the given system requires a special library for dl* calls, include it with the linker flags
 if(CMAKE_DL_LIBS)
-  append_to_list(LINK_LIBS ${CMAKE_DL_LIBS})
-endif(CMAKE_DL_LIBS)
+  list(APPEND LINK_LIBS ${CMAKE_DL_LIBS})
+endif()
 
 # Under MinGW, the -shared flag isn't properly set in the module-specific linker flags, add it from the C flags for shared libraries
 if(MINGW)
   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}")
-endif(MINGW)
+endif()
 
-# Under Windows, we set the executable name for Anope to be anope
-if(WIN32)
+if(NOT PROGRAM_NAME)
   set(PROGRAM_NAME anope)
-# Under *nix, we set the executable name for Anope to be services
-else(WIN32)
-  set(PROGRAM_NAME services)
-endif(WIN32)
+endif()
 
 # If we are not using Visual Studio, we'll run the following checks
 if(NOT MSVC)
   # Check if the C++ compiler can accept the -pipe flag, and add it to the compile flags if it works
-  if(CMAKE244_OR_BETTER)
-    # If using CMake 2.4.4 or better, we can use check_cxx_compiler_flag
-    check_cxx_compiler_flag(-pipe HAVE_PIPE_FLAG)
-  else(CMAKE244_OR_BETTER)
-    # If using CMake 2.4.3 or older, we will use check_cxx_accepts_flags instead
-    check_cxx_accepts_flag(-pipe HAVE_PIPE_FLAG)
-  endif(CMAKE244_OR_BETTER)
+  check_cxx_compiler_flag(-pipe HAVE_PIPE_FLAG)
   # If the flag was accepted, add it to the list of flags
   if(HAVE_PIPE_FLAG)
     set(CXXFLAGS "${CXXFLAGS} -pipe")
-  endif(HAVE_PIPE_FLAG)
+  endif()
 
   # The following are additional library checks, they are not required for Windows
   if(NOT WIN32)
     # Check if socket is within the socket library (if the library exists), and add it to the linker flags if needed
     check_library_exists(socket socket "" HAVE_SOCKET_LIB)
     if(HAVE_SOCKET_LIB)
-      append_to_list(LINK_LIBS socket)
-    endif(HAVE_SOCKET_LIB)
+      list(APPEND LINK_LIBS socket)
+    endif()
     # Check if inet_addr is within the nsl library (if the library exists), and add it to the linker flags if needed
     check_library_exists(nsl inet_addr "" HAVE_NSL_LIB)
     if(HAVE_NSL_LIB)
-      append_to_list(LINK_LIBS nsl)
-    endif(HAVE_NSL_LIB)
+      list(APPEND LINK_LIBS nsl)
+    endif()
     # Check if pthread_create is within the pthread library (if the library exists), and add it to the linker flags if needed
     check_library_exists(pthread pthread_create "" HAVE_PTHREAD)
     if(HAVE_PTHREAD)
       if(NOT APPLE)
         set(LDFLAGS "${LDFLAGS} -pthread")
-      endif(NOT APPLE)
-    else(HAVE_PTHREAD)
+      endif()
+    else()
       message(FATAL_ERROR "The pthread library is required to build Anope")
-    endif(HAVE_PTHREAD)
-  endif(NOT WIN32)
-endif(NOT MSVC)
+    endif()
+  endif()
+endif()
 
 # If DEFUMASK wasn't passed to CMake, set a default depending on if RUNGROUP was passed in or not
 if(NOT DEFUMASK)
   if(RUNGROUP)
     set(DEFUMASK "007")
-  else(RUNGROUP)
+  else()
     set(DEFUMASK "077")
-  endif(RUNGROUP)
-endif(NOT DEFUMASK)
+  endif()
+endif()
 
 # Set the DEBUG_BUILD for sysconf.h
 if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
   set(DEBUG_BUILD TRUE)
-endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
+endif()
 
-# Check for the existance of the following include files
-check_include_file(cstdint HAVE_CSTDINT)
-check_include_file(stdint.h HAVE_STDINT_H)
-check_include_file(strings.h HAVE_STRINGS_H)
-
-# Check for the existance of the following functions
-check_function_exists(strcasecmp HAVE_STRCASECMP)
-check_function_exists(stricmp HAVE_STRICMP)
+# Check for the existence of the following functions
 check_function_exists(umask HAVE_UMASK)
 check_function_exists(epoll_wait HAVE_EPOLL)
 check_function_exists(poll HAVE_POLL)
@@ -358,71 +245,60 @@ check_function_exists(kqueue HAVE_KQUEUE)
 
 # Strip the leading and trailing spaces from the compile flags
 if(CXXFLAGS)
-  strip_string(${CXXFLAGS} CXXFLAGS)
-endif(CXXFLAGS)
+  string(STRIP ${CXXFLAGS} CXXFLAGS)
+endif()
 # Strip the leading and trailing spaces from the linker flags
 if(LDFLAGS)
-  strip_string(${LDFLAGS} LDFLAGS)
-endif(LDFLAGS)
+  string(STRIP ${LDFLAGS} LDFLAGS)
+endif()
 
 # Search for the following programs
-find_program(GREP grep)
-find_program(SH sh)
-find_program(CHGRP chgrp)
-find_program(CHMOD chmod)
-find_program(PERL perl)
+find_program(CHGRP "chgrp" REQUIRED)
+find_program(CHMOD "chmod" REQUIRED)
 
-# If perl is included on the system and the user wants to use run-cc.pl, change the commands for compiling and linking
-if(PERL AND USE_RUN_CC_PL)
-  set(CMAKE_CXX_COMPILE_OBJECT "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_COMPILE_OBJECT}")
-  set(CMAKE_CXX_LINK_EXECUTABLE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_LINK_EXECUTABLE}")
-  set(CMAKE_CXX_CREATE_SHARED_MODULE "${PERL} ${Anope_SOURCE_DIR}/run-cc.pl -q ${CMAKE_CXX_CREATE_SHARED_MODULE}")
-endif(PERL AND USE_RUN_CC_PL)
-
-# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the services directory under the user's home directory
+# If a INSTDIR was passed in to CMake, use it as the install prefix, otherwise set the default install prefix to the anope directory under the user's home directory
 if(INSTDIR)
   set(CMAKE_INSTALL_PREFIX "${INSTDIR}")
-else(INSTDIR)
-  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/services")
-endif(INSTDIR)
+elseif(NOT CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/anope")
+endif()
 
 # Set default paths for various directories if not already defined
 if(NOT BIN_DIR)
   set(BIN_DIR "bin")
-endif(NOT BIN_DIR)
+endif()
 if(NOT DB_DIR)
   set(DB_DIR "data")
-endif(NOT DB_DIR)
+endif()
 if(NOT DOC_DIR)
   set(DOC_DIR "doc")
-endif(NOT DOC_DIR)
+endif()
 if(NOT CONF_DIR)
   set(CONF_DIR "conf")
-endif(NOT CONF_DIR)
+endif()
 if(NOT LIB_DIR)
   set(LIB_DIR "lib")
-endif(NOT LIB_DIR)
+endif()
 if(NOT LOCALE_DIR)
   set(LOCALE_DIR "locale")
-endif(NOT LOCALE_DIR)
+endif()
 if(NOT LOGS_DIR)
   set(LOGS_DIR "logs")
-endif(NOT LOGS_DIR)
+endif()
 
 # Version number processing
 # Find all lines in src/version.sh that start with VERSION_
-read_from_file(${Anope_SOURCE_DIR}/src/version.sh "^VERSION_" VERSIONS)
+file(STRINGS ${Anope_SOURCE_DIR}/src/version.sh VERSIONS REGEX "^VERSION_")
 # Iterate through the strings found
 foreach(VERSION_STR ${VERSIONS})
   string(REGEX REPLACE "^VERSION_([A-Z]+)=\"?([^\"]*)\"?$" "\\1;\\2" VERSION_OUT ${VERSION_STR})
-  # Depends on CMP0007 OLD
   list(LENGTH VERSION_OUT VERSION_LEN)
   list(GET VERSION_OUT 0 VERSION_TYPE)
   if(${VERSION_LEN} GREATER 1)
     list(GET VERSION_OUT 1 VERSION_DATA)
     set(VERSION_${VERSION_TYPE} ${VERSION_DATA})
-  endif(${VERSION_LEN} GREATER 1)
-endforeach(VERSION_STR ${VERSIONS})
+  endif()
+endforeach()
 
 # Default build version to 0
 set(VERSION_BUILD 0)
@@ -430,7 +306,7 @@ set(VERSION_BUILD 0)
 # Only change the build number if version.h exists
 if(EXISTS "${Anope_SOURCE_DIR}/include/version.h")
   # Attempt to read the build number from include/version.h
-  read_from_file(${Anope_SOURCE_DIR}/include/version.h "^#define VERSION_BUILD" VERSIONS)
+  file(STRINGS ${Anope_SOURCE_DIR}/src/version.sh VERSIONS REGEX "^#define VERSION_BUILD")
   foreach(VERSION_STR ${VERSIONS})
     # Get the length of the string
     string(LENGTH ${VERSION_STR} VERSION_LEN)
@@ -440,8 +316,8 @@ if(EXISTS "${Anope_SOURCE_DIR}/include/version.h")
     string(SUBSTRING ${VERSION_STR} 22 ${VERSION_NUM_LEN} VERSION)
     # Set VERSION_BUILD correctly
     set(VERSION_BUILD ${VERSION})
-  endforeach(VERSION_STR ${VERSIONS})
-endif(EXISTS "${Anope_SOURCE_DIR}/include/version.h")
+  endforeach()
+endif()
 
 # Set the version variables based on what was found above
 set(VERSION_COMMA "${VERSION_MAJOR},${VERSION_MINOR},${VERSION_PATCH},${VERSION_BUILD}")
@@ -454,7 +330,7 @@ set(VERSION_FULL_NOBUILD "${VERSION_DOTTED_NOBUILD}${VERSION_EXTRA}")
 if(WIN32)
   # Generate the win32.rc file using the above variables
   configure_file(${Anope_SOURCE_DIR}/src/win32/win32.rc.cmake ${Anope_BINARY_DIR}/src/win32/win32.rc)
-endif(WIN32)
+endif()
 
 # Add the initial files to ignore which will be ignored regardless of if you are building in-source or out-of-source
 add_to_cpack_ignored_files(".git\;config.cache\;CMakeFiles\;sysconf.h$\;build" TRUE)
@@ -469,8 +345,8 @@ if(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
   # If using Visual Studio, add these files as well
   if(MSVC)
     add_to_cpack_ignored_files(".vcproj$\;.sln$\;.ncb$\;.suo$\;.dir$\;.ilk$\;.exp$\;.pdb$\;.lib$\;/debug$;/release$;/relwithdebinfo$;/minsizerel$" TRUE)
-  endif(MSVC)
-endif(${Anope_SOURCE_DIR} STREQUAL ${Anope_BINARY_DIR})
+  endif()
+endif()
 
 # Go into the following directories and run their CMakeLists.txt as well
 add_subdirectory(data)
@@ -481,33 +357,29 @@ add_subdirectory(modules)
 add_subdirectory(include)
 
 # Get the filename of the Anope binary, to use later
-get_target_property(SERVICES_BINARY ${PROGRAM_NAME} LOCATION)
+set(SERVICES_BINARY "$<TARGET_FILE:${PROGRAM_NAME}>")
 get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME)
 
 # At install time, create the following additional directories
-install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")")
-install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")")
+install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")")
+install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")")
 if(WIN32)
-  install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")")
-endif(WIN32)
+  install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")")
+endif()
 # On non-Windows platforms, if RUNGROUP is set, change the permissions of the below directories, as well as the group of the data directory
 if(NOT WIN32 AND RUNGROUP)
-  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")")
-  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")")
-  install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\${CMAKE_INSTALL_PREFIX}\")")
-endif(NOT WIN32 AND RUNGROUP)
+  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")")
+  install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")")
+  install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")")
+endif()
 # On Windows platforms, install extra files
 if(WIN32)
   install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat
     DESTINATION ${BIN_DIR}
   )
+endif()
 
-  # Package any DLLs in src/win/
-  file(GLOB EXTRA_DLLS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${Anope_SOURCE_DIR}/src/win32/*.dll")
-  install(FILES ${EXTRA_DLLS} DESTINATION ${BIN_DIR})
-endif(WIN32)
-
-install(CODE "file(REMOVE_RECURSE \"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")
+install(CODE "file(REMOVE_RECURSE \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/modules\")")
 
 # Only process the CPack section if we have CPack
 if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
@@ -537,19 +409,19 @@ 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)
+  endif()
   set(CPACK_SOURCE_PACKAGE_FILE_NAME "anope-${VERSION_FULL_NOBUILD}-source")
   set(CPACK_SOURCE_GENERATOR "TGZ")
   set(CPACK_SOURCE_IGNORE_FILES "$ENV{CPACK_IGNORED_FILES}")
   set(CPACK_MONOLITHIC_INSTALL TRUE)
   include(CPack)
-endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+endif()

Config

@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# Configuration script for Services.
+# Configuration script for Anope.
 #
-# Anope (c) 2003-2014 Anope Team
+# Anope (C) 2003-2023 Anope Team
 # Contact us at team@anope.org
 #
 # This program is free but copyrighted software; see the file COPYING for
@@ -62,18 +62,6 @@ Run_Build_System () {
 		BUILD_TYPE="-DCMAKE_BUILD_TYPE:STRING=RELEASE"
 	fi
 
-	if [ "$USE_RUN_CC_PL" = "yes" ] ; then
-		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=ON"
-	else
-		RUN_CC_PL="-DUSE_RUN_CC_PL:BOOLEAN=OFF"
-	fi
-
-	if [ "$USE_PCH" = "yes" ] ; then
-		PCH="-DUSE_PCH:BOOLEAN=ON"
-	else
-		PCH="-DUSE_PCH:BOOLEAN=OFF"
-	fi
-
 	if [ "$EXTRA_INCLUDE_DIRS" != "" ] ; then
 		EXTRA_INCLUDE="-DEXTRA_INCLUDE:STRING=$EXTRA_INCLUDE_DIRS"
 	fi
@@ -82,12 +70,6 @@ Run_Build_System () {
 		EXTRA_LIBS="-DEXTRA_LIBS:STRING=$EXTRA_LIB_DIRS"
 	fi
 
-	case `uname -s` in
-		MINGW*)
-			GEN_TYPE="-G\"MSYS Makefiles\""
-			;;
-	esac
-
 	if [ "$SOURCE_DIR" = "." ] ; then
 		pwdsave=`pwd`
 		test -d build || mkdir build
@@ -97,9 +79,13 @@ Run_Build_System () {
 		REAL_SOURCE_DIR="$SOURCE_DIR"
 	fi
 
-	echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $PCH $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR"
+	echo "cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR"
 
-	cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $RUN_CC_PL $PCH $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR
+	cmake $GEN_TYPE $WITH_INST $WITH_RUN $WITH_PERM $BUILD_TYPE $EXTRA_INCLUDE $EXTRA_LIBS $EXTRA_CONFIG_ARGS $REAL_SOURCE_DIR
+	if [ $? -ne 0 ]; then
+		echo "You should fix these issues and then run ./Config -quick to rerun CMake."
+		exit 1
+	fi
 
 	echo ""
 	if [ "$SOURCE_DIR" = "." ] ; then
@@ -127,12 +113,10 @@ export ECHO2 ECHO2SUF
 # Init values
 ###########################################################################
 
-INSTDIR=$HOME/services
+INSTDIR=$HOME/anope
 RUNGROUP=
 UMASK=
 DEBUG="no"
-USE_RUN_CC_PL="no"
-USE_PCH="no"
 EXTRA_INCLUDE_DIRS=
 EXTRA_LIB_DIRS=
 EXTRA_CONFIG_ARGS=
@@ -152,6 +136,9 @@ while [ $# -ge 1 ] ; do
 		echo "-nointro     Skip intro (disclaimer, etc)"
 		echo "-quick       Skip questions, go straight to cmake"
 		exit 0
+	elif [ $1 = "-devel" ] ; then
+		DEBUG="yes"
+		INSTDIR="$PWD/run"
 	elif [ $1 = "-nocache" ] ; then
 		IGNORE_CACHE="1"
 	elif [ $1 = "-nointro" ] ; then
@@ -173,10 +160,10 @@ done
 # Check for CMake and (optionally) install it
 ###########################################################################
 
-which cmake > /dev/null
+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 3.8 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
@@ -184,23 +171,15 @@ fi
 ###########################################################################
 
 if [ ! "$NO_INTRO" ] ; then
-	case `uname -s` in
-		MINGW*)
-			PAGER=less
-			;;
-		*)
-			PAGER=more
-			clear
-			;;
-	esac
+	export MORE='-e'
 	. $SOURCE_DIR/src/version.sh
-	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER
+	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | more
 	echo ""
 else
 	echo ""
 fi
 
-echo "Beginning Services configuration."
+echo "Beginning Anope configuration."
 echo ""
 
 ###########################################################################
@@ -239,7 +218,7 @@ while [ $ok -eq 0 ] ; do
 			fi
 		fi
 	elif exists "$INPUT/include/services.h" ; then
-		echo "You cannot use the Services source directory as a target directory."
+		echo "You cannot use the Anope source directory as a target directory."
 	else
 		ok=1
 	fi
@@ -251,11 +230,11 @@ echo ""
 
 OLD_RUNGROUP="$RUNGROUP"
 if [ "$RUNGROUP" ] ; then
-	echo "Which group should all Services data files be owned by?  (If Services"
+	echo "Which group should all Anope data files be owned by?  (If Anope"
 	echo "should not force files to be owned by a particular group, type \"none\""
 	echo "(without the quotes) and press Return.)"
 else
-	echo "Which group should all Services data files be owned by?  (If Services"
+	echo "Which group should all Anope data files be owned by?  (If Anope"
 	echo "should not force files to be owned by a particular group, just press"
 	echo "Return.)"
 fi
@@ -321,49 +300,6 @@ echo ""
 
 ####
 
-TEMP_YN="n"
-if [ "$USE_RUN_CC_PL" = "yes" ] ; then
-	TEMP_YN="y"
-fi
-echo "You can optionally have the build run through run-cc.pl, which will"
-echo "cause warnings and errors (if any) to be colored yellow and red,"
-echo "respectively. This relies on Perl being installed, so if you say yes"
-echo "to this without Perl, the option will be ignored."
-echo "NOTE: If you are using MinGW, it is NOT recommended to say yes to"
-echo "this, it may fail."
-echo "Would you like to utilize run-cc.pl?"
-echo2 "[$TEMP_YN] "
-read YN
-if [ "$YN" ] ; then
-	if [ "$YN" = "y" ] ; then
-		USE_RUN_CC_PL="yes"
-	else
-		USE_RUN_CC_PL="no"
-	fi
-fi
-echo ""
-
-####
-
-TEMP_YN="n"
-if [ "$USE_PCH" = "yes" ] ; then
-	TEMP_YN="y"
-fi
-echo "Do you want to build using precompiled headers? This can speed up"
-echo "the build, but uses more disk space."
-echo2 "[$TEMP_YN] "
-read YN
-if [ "$YN" ] ; then
-	if [ "$YN" = "y" ] ; then
-		USE_PCH="yes"
-	else
-		USE_PCH="no"
-	fi
-fi
-echo ""
-
-####
-
 echo "Are there any extra include directories you wish to use?"
 echo "You may only need to do this if CMake is unable to locate"
 echo "missing dependencies without hints."
@@ -401,7 +337,7 @@ echo ""
 ####
 
 echo "Are there any extra arguments you wish to pass to CMake?"
-echo "If you need no extra arugments to CMake, enter NONE in all caps."
+echo "If you need no extra arguments to CMake, enter NONE in all caps."
 echo2 "[$EXTRA_CONFIG_ARGS] "
 if read INPUT ; then : ; else echo "" ; exit 1 ; fi
 if [ "$INPUT" ] ; then
@@ -426,8 +362,6 @@ INSTDIR="$INSTDIR"
 RUNGROUP="$RUNGROUP"
 UMASK=$UMASK
 DEBUG="$DEBUG"
-USE_RUN_CC_PL="$USE_RUN_CC_PL"
-USE_PCH="$USE_PCH"
 EXTRA_INCLUDE_DIRS="$EXTRA_INCLUDE_DIRS"
 EXTRA_LIB_DIRS="$EXTRA_LIB_DIRS"
 EXTRA_CONFIG_ARGS="$EXTRA_CONFIG_ARGS"

README.md

@@ -0,0 +1,46 @@
+## About
+
+Anope is an open source set of IRC services. It is highly modular, with a vast number of configurable parameters, and is the most used IRC services package. There are also many modules on the [modsite](https://modules.anope.org) to add additional features. It runs on Linux, BSD, and Windows, and supports many modern IRCds, including InspIRCd, UnrealIRCd, and ircd-hybrid. For more details, credits, command line options, and contact information see [docs/README](https://github.com/anope/anope/blob/2.0/docs/README).
+
+* [Website](https://anope.org)
+* [GitHub](https://github.com/anope)
+* IRC \#anope on irc.anope.org
+
+## Installation
+
+### Linux/BSD
+Download the latest release off of the [releases page](https://github.com/anope/anope/releases).
+
+
+```
+$ ./Config
+$ cd build
+$ make
+$ make install
+```
+
+Now change to the directory where you installed Anope to, e.g. `$ cd ~/anope/`
+
+### Windows
+Download the latest release off of the [releases page](https://github.com/anope/anope/releases) and run the installer.
+
+
+## Configuration
+
+Copy conf/anope.example.conf to conf/anope.conf
+
+```
+$ cp conf/anope.example.conf conf/anope.conf
+```
+
+Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the anope.example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.anope.org](irc://irc.anope.org/#anope).
+
+Note that the example configuration file includes other example configuration files. If you want to modify the other example configuration files, copy them (e.g. `modules.example.conf` to `modules.conf`) and modify the `include` directive in `anope.conf` to include the new file.
+
+## Running
+
+Run `$ ./bin/anope` to start Anope. If asked to provide logs for support, use the `--support` flag, e.g.: `$ ./bin/anope --support`
+
+## Installing extra modules
+
+Extra modules, which are usually modules which require extra libraries to use, such as m\_mysql, can be enabled with the `./extras` command from the source directory. Then re-run `Config`, `make` and `make install` again. Third party modules can be installed by placing them into the `modules/third` directory.

cmake/Anope.cmake

@@ -1,421 +1,3 @@
-###############################################################################
-# strip_string(<input string> <output string>)
-#
-# A macro to handle stripping the leading and trailing spaces from a string,
-#   uses string(STRIP) if using CMake 2.6.x or better, otherwise uses
-#   string(REGEX REPLACE).
-###############################################################################
-macro(strip_string INPUT_STRING OUTPUT_STRING)
-  if(CMAKE26_OR_BETTER)
-    # For CMake 2.6.x or better, we can just use the STRIP sub-command of string()
-    string(STRIP ${INPUT_STRING} ${OUTPUT_STRING})
-  else(CMAKE26_OR_BETTER)
-    # For CMake 2.4.x, we will have to use the REGEX REPLACE sub-command of string() instead
-    # First check if the input string is empty or not
-    if (${INPUT_STRING} STREQUAL "")
-      set(${OUTPUT_STRING} "")
-    else(${INPUT_STRING} STREQUAL "")
-      # Determine if the string is entirely empty or not
-      string(REGEX MATCH "^[ \t]*$" EMPTY_STRING "${INPUT_STRING}")
-      if(EMPTY_STRING)
-        set(${OUTPUT_STRING} "")
-      else(EMPTY_STRING)
-        # We detect if there is any leading whitespace and remove any if there is
-        string(SUBSTRING "${INPUT_STRING}" 0 1 FIRST_CHAR)
-        if(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t")
-          string(REGEX REPLACE "^[ \t]+" "" TEMP_STRING "${INPUT_STRING}")
-        else(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t")
-          set(TEMP_STRING "${INPUT_STRING}")
-        endif(FIRST_CHAR STREQUAL " " OR FIRST_CHAR STREQUAL "\t")
-        # Next we detect if there is any trailing whitespace and remove any if there is
-        string(LENGTH "${TEMP_STRING}" STRING_LEN)
-        math(EXPR STRING_LEN "${STRING_LEN} - 1")
-        string(SUBSTRING "${TEMP_STRING}" ${STRING_LEN} 1 LAST_CHAR)
-        if(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t")
-          string(REGEX REPLACE "[ \t]+$" "" ${OUTPUT_STRING} "${TEMP_STRING}")
-        else(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t")
-          set(${OUTPUT_STRING} "${TEMP_STRING}")
-        endif(LAST_CHAR STREQUAL " " OR LAST_CHAR STREQUAL "\t")
-      endif(EMPTY_STRING)
-    endif(${INPUT_STRING} STREQUAL "")
-  endif(CMAKE26_OR_BETTER)
-endmacro(strip_string)
-
-###############################################################################
-# append_to_list(<list> <args>...)
-#
-# A macro to handle appending to lists, uses list(APPEND) if using CMake 2.4.2
-#   or better, otherwise uses set() instead.
-###############################################################################
-macro(append_to_list LIST)
-  if(CMAKE242_OR_BETTER)
-    # For CMake 2.4.2 or better, we can just use the APPEND sub-command of list()
-    list(APPEND ${LIST} ${ARGN})
-  else(CMAKE242_OR_BETTER)
-    # For CMake 2.4.x before 2.4.2, we have to do this manually use set() instead
-    set(${LIST} ${${LIST}} ${ARGN})
-  endif(CMAKE242_OR_BETTER)
-endmacro(append_to_list)
-
-###############################################################################
-# find_in_list(<list> <value> <output variable>)
-#
-# A macro to handle searching within a list, will store the result in the
-#   given <output variable>, uses list(FIND) if using CMake 2.6.x or better
-#   (or CMake 2.4.8 or better), otherwise it iterates through the list to find
-#   the item.
-###############################################################################
-macro(find_in_list LIST ITEM_TO_FIND FOUND)
-  if(CMAKE248_OR_BETTER)
-    # For CMake 2.4.8 or better, we can use the FIND sub-command of list()
-    list(FIND ${LIST} ${ITEM_TO_FIND} ITEM_FOUND)
-  else(CMAKE248_OR_BETTER)
-    # For CMake 2.4.x before 2.4.8, we have to do this ourselves (NOTE: This is very slow due to a lack of break() as well)
-    # Firstly we set the position to -1 indicating nothing found, we also use a temporary position
-    set(ITEM_FOUND -1)
-    set(POS 0)
-    # Iterate through the list
-    foreach(ITEM ${${LIST}})
-      # If the item we are looking at is the item we are trying to find, set that we've found the item
-      if(${ITEM} STREQUAL ${ITEM_TO_FIND})
-        set(ITEM_FOUND ${POS})
-      endif(${ITEM} STREQUAL ${ITEM_TO_FIND})
-      # Increase the position value by 1
-      math(EXPR POS "${POS} + 1")
-    endforeach(ITEM)
-  endif(CMAKE248_OR_BETTER)
-  # Set the given FOUND variable to the result
-  set(${FOUND} ${ITEM_FOUND})
-endmacro(find_in_list)
-
-###############################################################################
-# remove_list_duplicates(<list>)
-#
-# A macro to handle removing duplicates from a list, uses
-#   list(REMOVE_DUPLICATES) if using CMake 2.6.x or better, otherwise it uses
-#   a slower method of creating a temporary list and only adding to it when
-#   a duplicate item hasn't been found.
-###############################################################################
-macro(remove_list_duplicates LIST)
-  if(CMAKE26_OR_BETTER)
-    # For CMake 2.6.x or better, this can be done automatically
-    list(REMOVE_DUPLICATES ${LIST})
-  else(CMAKE26_OR_BETTER)
-    # For CMake 2.4.x, we have to do this ourselves, firstly we'll clear a temporary list
-    set(NEW_LIST)
-    # Iterate through the old list
-    foreach(ITEM ${${LIST}})
-      # Check if the item is in the new list
-      find_in_list(NEW_LIST ${ITEM} FOUND_ITEM)
-      if(FOUND_ITEM EQUAL -1)
-        # If the item was not found, append it to the list
-        append_to_list(NEW_LIST ${ITEM})
-      endif(FOUND_ITEM EQUAL -1)
-    endforeach(ITEM)
-    # Replace the old list with the new list
-    set(${LIST} ${NEW_LIST})
-  endif(CMAKE26_OR_BETTER)
-endmacro(remove_list_duplicates)
-
-###############################################################################
-# remove_item_from_list(<list> <value>)
-#
-# A macro to handle removing a value from a list, uses list(REMOVE_ITEM) in
-#   both cases, but can remove the value itself using CMake 2.4.2 or better,
-#   while older versions use a slower method of iterating the list to find the
-#   index of the value to remove.
-###############################################################################
-macro(remove_item_from_list LIST VALUE)
-  if(CMAKE242_OR_BETTER)
-    # For CMake 2.4.2 or better, this can be done automatically
-    list(REMOVE_ITEM ${LIST} ${VALUE})
-  else(CMAKE242_OR_BETTER)
-    # For CMake 2.4.x before 2.4.2, we have to do this ourselves, firstly we set the index and a variable to indicate if the item was found
-    set(INDEX 0)
-    set(FOUND FALSE)
-    # Iterate through the old list
-    foreach(ITEM ${${LIST}})
-      # If the item hasn't been found yet, but the current item is the same, remove it
-      if(NOT FOUND)
-        if(ITEM STREQUAL ${VALUE})
-          set(FOUND TRUE)
-          list(REMOVE_ITEM ${LIST} ${INDEX})
-        endif(ITEM STREQUAL ${VALUE})
-      endif(NOT FOUND)
-      # Increase the index value by 1
-      math(EXPR INDEX "${INDEX} + 1")
-    endforeach(ITEM)
-  endif(CMAKE242_OR_BETTER)
-endmacro(remove_item_from_list)
-
-###############################################################################
-# sort_list(<list>)
-#
-# A macro to handle sorting a list, uses list(SORT) if using CMake 2.4.4 or
-#   better, otherwise it uses a slower method of creating a temporary list and
-#   adding elements in alphabetical order.
-###############################################################################
-macro(sort_list LIST)
-  if(CMAKE244_OR_BETTER)
-    # For CMake 2.4.4 or better, this can be done automatically
-    list(SORT ${LIST})
-  else(CMAKE244_OR_BETTER)
-    # For CMake 2.4.x before 2.4.4, we have to do this ourselves, firstly we'll create a teporary list
-    set(NEW_LIST)
-    # Iterate through the old list
-    foreach(ITEM ${${LIST}})
-      # Temporary index position for the new list, as well as temporary value to store if the item was ever found
-      set(INDEX 0)
-      set(FOUND FALSE)
-      # Iterate through the new list
-      foreach(NEW_ITEM ${NEW_LIST})
-        # Compare the items, only if nothing was found before
-        if(NOT FOUND)
-          if(NEW_ITEM STRGREATER "${ITEM}")
-            set(FOUND TRUE)
-            list(INSERT NEW_LIST ${INDEX} ${ITEM})
-          endif(NEW_ITEM STRGREATER "${ITEM}")
-        endif(NOT FOUND)
-        # Increase the index value by 1
-        math(EXPR INDEX "${INDEX} + 1")
-      endforeach(NEW_ITEM)
-      # If the item was never found, just append it to the end
-      if(NOT FOUND)
-        append_to_list(NEW_LIST ${ITEM})
-      endif(NOT FOUND)
-    endforeach(ITEM)
-    # Replace the old list with the new list
-    set(${LIST} ${NEW_LIST})
-  endif(CMAKE244_OR_BETTER)
-endmacro(sort_list)
-
-###############################################################################
-# read_from_file(<filename> <regex> <output variable>)
-#
-# A macro to handle reading specific lines from a file, uses file(STRINGS) if
-#   using CMake 2.6.x or better, otherwise we read in the entire file and
-#   perform a string(REGEX MATCH) on each line of the file instead.  This
-#   macro can also be used to read in all the lines of a file if REGEX is set
-#   to "".
-###############################################################################
-macro(read_from_file FILE REGEX STRINGS)
-  if(CMAKE26_OR_BETTER)
-    # For CMake 2.6.x or better, we can just use the STRINGS sub-command to get the lines that match the given regular expression (if one is given, otherwise get all lines)
-    if(REGEX STREQUAL "")
-      file(STRINGS ${FILE} RESULT)
-    else(REGEX STREQUAL "")
-      file(STRINGS ${FILE} RESULT REGEX ${REGEX})
-    endif(REGEX STREQUAL "")
-  else(CMAKE26_OR_BETTER)
-    # For CMake 2.4.x, we need to do this manually, firstly we read the file in
-    execute_process(COMMAND ${CMAKE_COMMAND} -DFILE:STRING=${FILE} -P ${Anope_SOURCE_DIR}/cmake/ReadFile.cmake ERROR_VARIABLE ALL_STRINGS)
-    # Next we replace all newlines with semicolons
-    string(REGEX REPLACE "\n" ";" ALL_STRINGS ${ALL_STRINGS})
-    if(REGEX STREQUAL "")
-      # For no regular expression, just set the result to all the lines
-      set(RESULT ${ALL_STRINGS})
-    else(REGEX STREQUAL "")
-      # Clear the result list
-      set(RESULT)
-      # Iterate through all the lines of the file
-      foreach(STRING ${ALL_STRINGS})
-        # Check for a match against the given regular expression
-        string(REGEX MATCH ${REGEX} STRING_MATCH ${STRING})
-        # If we had a match, append the match to the list
-        if(STRING_MATCH)
-          append_to_list(RESULT ${STRING})
-        endif(STRING_MATCH)
-      endforeach(STRING)
-    endif(REGEX STREQUAL "")
-  endif(CMAKE26_OR_BETTER)
-  # Set the given STRINGS variable to the result
-  set(${STRINGS} ${RESULT})
-endmacro(read_from_file)
-
-###############################################################################
-# extract_include_filename(<line> <output variable> [<optional output variable of quote type>])
-#
-# This macro will take a #include line and extract the filename.
-###############################################################################
-macro(extract_include_filename INCLUDE FILENAME)
-  # Strip the leading and trailing spaces from the include line
-  strip_string(${INCLUDE} INCLUDE_STRIPPED)
-  # Make sure to only do the following if there is a string
-  if(INCLUDE_STRIPPED STREQUAL "")
-    set(FILE "")
-  else(INCLUDE_STRIPPED STREQUAL "")
-    # Extract the filename including the quotes or angle brackets
-    string(REGEX REPLACE "^.*([\"<].*[\">]).*$" "\\1" FILE "${INCLUDE_STRIPPED}")
-    # If an optional 3rd argument is given, we'll store if the quote style was quoted or angle bracketed
-    if(${ARGC} GREATER 2)
-      string(SUBSTRING ${FILE} 0 1 QUOTE)
-      if(QUOTE STREQUAL "<")
-        set(${ARGV2} "angle brackets")
-      else(QUOTE STREQUAL "<")
-        set(${ARGV2} "quotes")
-      endif(QUOTE STREQUAL "<")
-    endif(${ARGC} GREATER 2)
-    # Now remove the quotes or angle brackets
-    string(REGEX REPLACE "^[\"<](.*)[\">]$" "\\1" FILE "${FILE}")
-  endif(INCLUDE_STRIPPED STREQUAL "")
-  # Set the filename to the the given variable
-  set(${FILENAME} "${FILE}")
-endmacro(extract_include_filename)
-
-###############################################################################
-# find_includes(<source filename> <output variable>)
-#
-# This macro will search through a file for #include lines, regardless of
-#   whitespace, but only returns the lines that are valid for the current
-#   platform CMake is running on.
-###############################################################################
-macro(find_includes SRC INCLUDES)
-  # Read all lines from the file that start with #, regardless of whitespace before the #
-  read_from_file(${SRC} "^[ \t]*#.*$" LINES)
-  # Set that any #include lines found are valid, and create temporary variables for the last found #ifdef/#ifndef
-  set(VALID_LINE TRUE)
-  set(LAST_DEF)
-  set(LAST_CHECK)
-  # Create an empty include list
-  set(INCLUDES_LIST)
-  # Iterate through all the # lines
-  foreach(LINE ${LINES})
-    # Search for #ifdef, #ifndef, #else, #endif, and #include
-    string(REGEX MATCH "^[ \t]*#[ \t]*ifdef[ \t]*.*$" FOUND_IFDEF ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*ifndef[ \t]*.*$" FOUND_IFNDEF ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*else.*$" FOUND_ELSE ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*endif.*$" FOUND_ENDIF ${LINE})
-    string(REGEX MATCH "^[ \t]*#[ \t]*include[ \t]*[\"<].*[\">][\ t]*.*$" FOUND_INCLUDE ${LINE})
-    # If we found a #ifdef on the line, extract the data after the #ifdef and set if the lines after it are valid based on the variables in CMake
-    if(FOUND_IFDEF)
-      # Extract the define
-      string(REGEX REPLACE "^[ \t]*#[ \t]*ifdef[ \t]*(.*)$" "\\1" DEFINE ${LINE})
-      # Replace _WIN32 with WIN32, so we can check if the WIN32 variable of CMake is set instead of _WIN32
-      if(DEFINE STREQUAL "_WIN32")
-        set(DEFINE WIN32)
-      endif(DEFINE STREQUAL "_WIN32")
-      # Set the last define to this one, and set the last check to true, so when #else is encountered, we can do an opposing check
-      set(LAST_DEF ${DEFINE})
-      set(LAST_CHECK TRUE)
-      # If the define is true (it either exists or is a non-false result), the lines following will be checked, otherwise they will be skipped
-      if(${DEFINE})
-        set(VALID_LINE TRUE)
-      else(${DEFINE})
-        set(VALID_LINE FALSE)
-      endif(${DEFINE})
-    else(FOUND_IFDEF)
-      # If we found a #ifndef on the line, the same thing as #ifdef is done, except with the checks in the opposite direction
-      if(FOUND_IFNDEF)
-        # Extract the define
-        string(REGEX REPLACE "^[ \t]*#[ \t]*ifndef[ \t]*(.*)$" "\\1" DEFINE ${LINE})
-        # Replace _WIN32 with WIN32, so we can check if the WIN32 variable of CMake is set instead of _WIN32
-        if(DEFINE STREQUAL "_WIN32")
-          set(DEFINE WIN32)
-        endif(DEFINE STREQUAL "_WIN32")
-        # Set the last define to this one, and set the last check to false, so when #else is encountered, we can do an opposing check
-        set(LAST_DEF ${DEFINE})
-        set(LAST_CHECK FALSE)
-        # If the define is not true (it either doesn't exists or is a false result), the lines following will be checked, otherwise they will be skipped
-        if(${DEFINE})
-          set(VALID_LINE FALSE)
-        else(${DEFINE})
-          set(VALUE_LINE TRUE)
-        endif(${DEFINE})
-      else(FOUND_IFNDEF)
-        # If we found a #else on the line, we check the last define in the opposite direction
-        if(FOUND_ELSE)
-          # When LAST_CHECK is true, we were inside a #ifdef, now act as if we are entering a #ifndef section by doing an opposing check
-          if(LAST_CHECK)
-            if(${LAST_DEF})
-              set(VALID_LINE FALSE)
-            else(${LAST_DEF})
-              set(VALID_LINE TRUE)
-            endif(${LAST_DEF})
-          # When LAST_CHECK is false, we were inside a #ifndef, now act as if we are entering a #ifdef section by doing an opposing check
-          else(LAST_CHECK)
-            if(${LAST_DEF})
-              set(VALID_LINE TRUE)
-            else(${LAST_DEF})
-              set(VALID_LINE FALSE)
-            endif(${LAST_DEF})
-          endif(LAST_CHECK)
-        else(FOUND_ELSE)
-          # If we found a #endif on the line, we'll assume everything following the line is valid until we meet another one of the above lines
-          if(FOUND_ENDIF)
-            set(VALID_LINE TRUE)
-          else(FOUND_ENDIF)
-            # If we found a #include on the line, add the entire line to the list of includes unless the line isn't valid
-            if(FOUND_INCLUDE)
-              if(VALID_LINE)
-                append_to_list(INCLUDES_LIST "${LINE}")
-              endif(VALID_LINE)
-            endif(FOUND_INCLUDE)
-          endif(FOUND_ENDIF)
-        endif(FOUND_ELSE)
-      endif(FOUND_IFNDEF)
-    endif(FOUND_IFDEF)
-  endforeach(LINE)
-  set(${INCLUDES} ${INCLUDES_LIST})
-endmacro(find_includes)
-
-###############################################################################
-# calculate_depends(<source filename> [<optional output variable for includes>])
-#
-# This macro is used in most of the src (sub)directories to calculate the
-#   header file dependencies for the given source file.
-###############################################################################
-macro(calculate_depends SRC)
-  # Temporarily set that we didn't get a 3rd argument before we actually check if we did get one or not
-  set(CHECK_ANGLE_INCLUDES FALSE)
-  # Check for a third argument
-  if(${ARGC} GREATER 1)
-    set(CHECK_ANGLE_INCLUDES TRUE)
-  endif(${ARGC} GREATER 1)
-  # Find all the lines in the given source file that have any form of #include on them, regardless of whitespace, but only if they are valid for the platform we are on
-  find_includes(${SRC} INCLUDES)
-  # Reset the list of headers to empty
-  set(HEADERS)
-  # Iterate through the strings containing #include (if any)
-  foreach(INCLUDE ${INCLUDES})
-    # Extract the filename from the #include line
-    extract_include_filename(${INCLUDE} FILENAME QUOTE_TYPE)
-    if(QUOTE_TYPE STREQUAL "angle brackets")
-      # The following checks will only be done if there was a request for angle includes to be checked
-      if(CHECK_ANGLE_INCLUDES)
-        # Find the path of the include file
-        if(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-          find_path(FOUND_${FILENAME}_INCLUDE NAMES ${FILENAME} PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include ${EXTRA_INCLUDE})
-        else(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-          find_path(FOUND_${FILENAME}_INCLUDE NAMES ${FILENAME} ${EXTRA_INCLUDE})
-        endif(DEFAULT_INCLUDE_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        # If the include file was found, add it's path to the list of include paths, but only if it doesn't already exist and isn't in the defaults for the compiler
-        if(FOUND_${FILENAME}_INCLUDE)
-          # This used to be find_in_list, but it was changed to this loop to do a find on each default include directory, this fixes Mac OS X trying to get it's framework directories in here
-          set(FOUND_IN_DEFAULTS -1)
-          foreach(DEFAULT_INCLUDE_DIR ${DEFAULT_INCLUDE_DIRS})
-            string(REGEX REPLACE "\\+" "\\\\+" DEFAULT_INCLUDE_DIR ${DEFAULT_INCLUDE_DIR})
-            string(REGEX MATCH ${DEFAULT_INCLUDE_DIR} FOUND_DEFAULT ${FOUND_${FILENAME}_INCLUDE})
-            if(FOUND_DEFAULT)
-              set(FOUND_IN_DEFAULTS 0)
-            endif(FOUND_DEFAULT)
-          endforeach(DEFAULT_INCLUDE_DIR)
-          if(FOUND_IN_DEFAULTS EQUAL -1)
-            find_in_list(${ARGV1} "${FOUND_${FILENAME}_INCLUDE}" FOUND_IN_INCLUDES)
-            if(FOUND_IN_INCLUDES EQUAL -1)
-              append_to_list(${ARGV1} "${FOUND_${FILENAME}_INCLUDE}")
-            endif(FOUND_IN_INCLUDES EQUAL -1)
-          endif(FOUND_IN_DEFAULTS EQUAL -1)
-        else(FOUND_${FILENAME}_INCLUDE)
-          # XXX
-          if(NOT ${FILENAME} STREQUAL "libintl.h")
-            message(FATAL_ERROR "${SRC} needs header file ${FILENAME} but we were unable to locate that header file! Check that the header file is within the search path of your OS.")
-          endif(NOT ${FILENAME} STREQUAL "libintl.h")
-        endif(FOUND_${FILENAME}_INCLUDE)
-      endif(CHECK_ANGLE_INCLUDES)
-    endif(QUOTE_TYPE STREQUAL "angle brackets")
-  endforeach(INCLUDE)
-endmacro(calculate_depends)
-
 ###############################################################################
 # calculate_libraries(<source filename> <output variable for linker flags> <output variable for extra depends>)
 #
@@ -433,10 +15,10 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS)
   set(LIBRARIES)
   # Check to see if there are any lines matching: /* RequiredLibraries: [something] */
   if(WIN32)
-    read_from_file(${SRC} "/\\\\*[ \t]*RequiredWindowsLibraries:[ \t]*.*[ \t]*\\\\*/" REQUIRED_LIBRARIES)
-  else(WIN32)
-    read_from_file(${SRC} "/\\\\*[ \t]*RequiredLibraries:[ \t]*.*[ \t]*\\\\*/" REQUIRED_LIBRARIES)
-  endif(WIN32)
+    file(STRINGS ${SRC} REQUIRED_LIBRARIES REGEX "/\\*[ \t]*RequiredWindowsLibraries:[ \t]*.*[ \t]*\\*/")
+  else()
+    file(STRINGS ${SRC} REQUIRED_LIBRARIES REGEX "/\\*[ \t]*RequiredLibraries:[ \t]*.*[ \t]*\\*/")
+  endif()
   # Iterate through those lines
   foreach(REQUIRED_LIBRARY ${REQUIRED_LIBRARIES})
     # Strip off the /* RequiredLibraries: and */ from the line
@@ -445,82 +27,60 @@ macro(calculate_libraries SRC SRC_LDFLAGS EXTRA_DEPENDS)
     string(REGEX REPLACE "," ";" REQUIRED_LIBRARY ${REQUIRED_LIBRARY})
     # Iterate through the libraries given
     foreach(LIBRARY ${REQUIRED_LIBRARY})
+      # If the library has multiple names extract the alternate.
+      unset(LIBRARY_ALT)
+      if (${LIBRARY} MATCHES "^.+\\|.+$")
+        string(REGEX REPLACE ".+\\|(.*)" "\\1" LIBRARY_ALT ${LIBRARY})
+        string(REGEX REPLACE "(.+)\\|.*" "\\1" LIBRARY ${LIBRARY})
+      endif()
       # Locate the library to see if it exists
-      if(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
-      else(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
-        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${EXTRA_INCLUDE} ${EXTRA_LIBS})
-      endif(DEFAULT_LIBRARY_DIRS OR WSDK_PATH OR DEFINED $ENV{VCINSTALLDIR})
+      if(DEFAULT_LIBRARY_DIRS OR DEFINED $ENV{VCINSTALLDIR})
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${DEFAULT_LIBRARY_DIRS} $ENV{VCINSTALLDIR}/lib ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+      else()
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS} NO_DEFAULT_PATH)
+        find_library(FOUND_${LIBRARY}_LIBRARY NAMES ${LIBRARY} ${LIBRARY_ALT} PATHS ${EXTRA_INCLUDE} ${EXTRA_LIBS})
+      endif()
       # If the library was found, we will add it to the linker flags
       if(FOUND_${LIBRARY}_LIBRARY)
-        # Get the path only of the library, to add it to linker flags
-        get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
         if(MSVC)
           # For Visual Studio, instead of editing the linker flags, we'll add the library to a separate list of extra dependencies
-          append_to_list(EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}")
-        else(MSVC)
-          # For all others, add the library paths and libraries
-          append_to_list(LIBRARY_PATHS "${LIBRARY_PATH}")
-          append_to_list(LIBRARIES "${LIBRARY}")
-        endif(MSVC)
-      else(FOUND_${LIBRARY}_LIBRARY)
+          list(APPEND EXTRA_DEPENDENCIES "${FOUND_${LIBRARY}_LIBRARY}")
+        else()
+          # Get the path only of the library, to add it to library paths.
+          get_filename_component(LIBRARY_PATH ${FOUND_${LIBRARY}_LIBRARY} PATH)
+          list(APPEND LIBRARY_PATHS "${LIBRARY_PATH}")
+          # Extract the library short name, add it to the library path
+          get_filename_component(LIBRARY_NAME ${FOUND_${LIBRARY}_LIBRARY} NAME_WE)
+          string(REGEX REPLACE "^lib" "" LIBRARY_NAME ${LIBRARY_NAME})
+          list(APPEND LIBRARIES ${LIBRARY_NAME})
+        endif()
+      else()
         # In the case of the library not being found, we fatally error so CMake stops trying to generate
         message(FATAL_ERROR "${SRC} needs library ${LIBRARY} but we were unable to locate that library! Check that the library is within the search path of your OS.")
-      endif(FOUND_${LIBRARY}_LIBRARY)
-    endforeach(LIBRARY)
-  endforeach(REQUIRED_LIBRARY)
+      endif()
+    endforeach()
+  endforeach()
   # Remove duplicates from the library paths
   if(LIBRARY_PATHS)
-    remove_list_duplicates(LIBRARY_PATHS)
-  endif(LIBRARY_PATHS)
+    list(REMOVE_DUPLICATES LIBRARY_PATHS)
+  endif()
   # Remove diplicates from the libraries
   if(LIBRARIES)
-    remove_list_duplicates(LIBRARIES)
-  endif(LIBRARIES)
+    list(REMOVE_DUPLICATES LIBRARIES)
+  endif()
   # Iterate through library paths and add them to the linker flags
   foreach(LIBRARY_PATH ${LIBRARY_PATHS})
-    find_in_list(DEFAULT_LIBRARY_DIRS "${LIBRARY_PATH}" FOUND_IN_DEFAULTS)
-    if(FOUND_IN_DEFAULTS EQUAL -1)
+    if(NOT "${LIBRARY_PATH}" IN_LIST DEFAULT_LIBRARY_DIRS)
       set(THIS_LDFLAGS "${THIS_LDFLAGS} -L${LIBRARY_PATH}")
-    endif(FOUND_IN_DEFAULTS EQUAL -1)
-  endforeach(LIBRARY_PATH)
+    endif()
+  endforeach()
   # Iterate through libraries and add them to the linker flags
   foreach(LIBRARY ${LIBRARIES})
-    append_to_list(EXTRA_DEPENDENCIES "${LIBRARY}")
-  endforeach(LIBRARY)
+    list(APPEND EXTRA_DEPENDENCIES "${LIBRARY}")
+  endforeach()
   set(${SRC_LDFLAGS} "${THIS_LDFLAGS}")
   set(${EXTRA_DEPENDS} "${EXTRA_DEPENDENCIES}")
-endmacro(calculate_libraries)
-
-###############################################################################
-# check_functions(<source filename> <output variable set to TRUE on success>)
-#
-# This macro is used in most of the module (sub)directories to calculate the
-#   fcuntion dependencies for the given source file.
-###############################################################################
-macro(check_functions SRC SUCCESS)
-  # Default to true
-  set(${SUCCESS} TRUE)
-  # Check to see if there are any lines matching: /* RequiredFunctions: [something] */
-  read_from_file(${SRC} "/\\\\*[ \t]*RequiredFunctions:[ \t]*.*[ \t]*\\\\*/" REQUIRED_FUNCTIONS)
-  # Iterate through those lines
-  foreach(REQUIRED_FUNCTION ${REQUIRED_FUNCTIONS})
-    # Strip off the /* RequiredFunctions: and */ from the line
-    string(REGEX REPLACE "/\\*[ \t]*RequiredFunctions:[ \t]*([^ \t]*)[ \t]*\\*/" "\\1" REQUIRED_FUNCTION ${REQUIRED_FUNCTION})
-    # Replace all commas with semicolons
-    string(REGEX REPLACE "," ";" REQUIRED_FUNCTION ${REQUIRED_FUNCTION})
-    # Iterate through the functions given
-    foreach(FUNCTION ${REQUIRED_FUNCTION})
-      # Check if the function exists
-      check_function_exists(${REQUIRED_FUNCTION} HAVE_${REQUIRED_FUNCTION})
-      # If we don't have the function warn the user and set SUCCESS to FALSE
-      if(NOT HAVE_${REQUIRED_FUNCTION})
-        message("${SRC} needs function ${REQUIRED_FUNCTION} but we were unable to locate that function!")
-        set(${SUCCESS} FALSE)
-      endif(NOT HAVE_${REQUIRED_FUNCTION})
-    endforeach(FUNCTION)
-  endforeach(REQUIRED_FUNCTION)
-endmacro(check_functions)
+endmacro()
 
 ###############################################################################
 # add_to_cpack_ignored_files(<item> [TRUE])
@@ -535,12 +95,12 @@ macro(add_to_cpack_ignored_files ITEM)
   # If we have 2+ arguments, assume that the second one was something like TRUE (doesn't matter really) and convert periods so they will be \\. for CPack
   if(${ARGC} GREATER 1)
     string(REPLACE "." "\\\\." REAL_ITEM ${REAL_ITEM})
-  endif(${ARGC} GREATER 1)
+  endif()
   # If the environment variable is already defined, just tack the item to the end
   if(DEFINED ENV{CPACK_IGNORED_FILES})
     set(ENV{CPACK_IGNORED_FILES} "$ENV{CPACK_IGNORED_FILES};${REAL_ITEM}")
   # Otherwise set the environment variable to the item
-  else(DEFINED ENV{CPACK_IGNORED_FILES})
+  else()
     set(ENV{CPACK_IGNORED_FILES} "${REAL_ITEM}")
-  endif(DEFINED ENV{CPACK_IGNORED_FILES})
-endmacro(add_to_cpack_ignored_files)
+  endif()
+endmacro()

cmake/FindGettext.cmake

@@ -1,26 +0,0 @@
-# Find the header files, libs, and executables for gettext
-if(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h /usr/include /usr/local/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY intl PATHS /usr/lib /usr/lib64 ${EXTRA_LIBS})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS /usr/bin/ /usr/local/bin ${EXTRA_INCLUDE})
-  if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
-    set(GETTEXT_FOUND TRUE)
-    if(GETTEXT_LIBRARY)
-      set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})
-    endif(GETTEXT_LIBRARY)
-  endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT)
-else(NOT WIN32)
-  find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE})
-  find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_LIBS})
-  find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE})
-  if(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT)
-    set(GETTEXT_FOUND TRUE)
-    set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY})
-  endif(GETTEXT_INCLUDE AND GETTEXT_LIBRARY AND GETTEXT_MSGFMT)
-endif(NOT WIN32)
-
-# If we found everything we need set variables correctly for lang/CMakeLists.txt to use
-if(GETTEXT_FOUND)
-  include_directories("${GETTEXT_INCLUDE}")
-  set(GETTEXT_MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT})
-endif(GETTEXT_FOUND)

cmake/NSIS.template.in

@@ -118,7 +118,7 @@ Var AR_RegFlags
  "exit_${SecName}:"
 !macroend
 
-!macro RemoveSection SecName
+!macro RemoveSection_CPack SecName
   ;  This macro is used to call section's Remove_... macro
   ;from the uninstaller.
   ;Input: section index constant name specified in Section command.
@@ -348,7 +348,7 @@ Function un.RemoveFromPath
 FunctionEnd
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
+; Uninstall stuff
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ###########################################
@@ -452,15 +452,15 @@ Done:
 	Exch $R1
 FunctionEnd
 
-Function ConditionalAddToRegisty
+Function ConditionalAddToRegistry
   Pop $0
   Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+  StrCmp "$0" "" ConditionalAddToRegistry_EmptyString
     WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
     "$1" "$0"
     ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
     DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
+  ConditionalAddToRegistry_EmptyString:
 FunctionEnd
 
 ;--------------------------------
@@ -558,44 +558,44 @@ Section "-Core installation"
   WriteUninstaller "$INSTDIR\Uninstall.exe"
   Push "DisplayName"
   Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DisplayVersion"
   Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Publisher"
   Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "UninstallString"
   Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "NoRepair"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
   !ifdef CPACK_NSIS_ADD_REMOVE
   ;Create add/remove functionality
   Push "ModifyPath"
   Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !else
   Push "NoModify"
   Push "1"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !endif
 
   ; Optional registration
   Push "DisplayIcon"
   Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "HelpLink"
   Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "URLInfoAbout"
   Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "Contact"
   Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 
   ;Create shortcuts
@@ -607,19 +607,19 @@ Section "-Core installation"
   ; Write special uninstall registry entries
   Push "StartMenu"
   Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "DoNotAddToPath"
   Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathAllUsers"
   Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "AddToPathCurrentUser"
   Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
   Push "InstallToDesktop"
   Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
+  Call ConditionalAddToRegistry
 
 @CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
 
@@ -731,7 +731,7 @@ Section "Uninstall"
   DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
+  !insertmacro SectionList "RemoveSection_CPack"
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
 
@@ -739,7 +739,7 @@ Section "Uninstall"
 @CPACK_NSIS_DELETE_ICONS@
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   startMenuDeleteLoop:
@@ -752,13 +752,13 @@ Section "Uninstall"
     StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
   startMenuDeleteLoopDone:
 
-  ; If the user changed the shortcut, then untinstall may not work. This should
+  ; If the user changed the shortcut, then uninstall may not work. This should
   ; try to fix it.
   StrCpy $MUI_TEMP "$START_MENU"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   secondStartMenuDeleteLoop:

cmake/ReadFile.cmake

@@ -1,5 +0,0 @@
-# This file is external to the read_from_file macro in Anope.cmake in order to
-# get around a possible memory leak in older versions of CMake.
-
-file(READ "${FILE}" RESULT)
-message("${RESULT}")

data/CMakeLists.txt

@@ -1,6 +1,6 @@
-# Only install example.chk and example.conf from this directory
+# Only install example.chk and anope.example.conf from this directory
 # NOTE: I would've had this just find all files in the directory, but that would include files not needed (like this file)
-set(DATA example.chk botserv.example.conf example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
+set(DATA example.chk anope.example.conf botserv.example.conf hostserv.example.conf modules.example.conf operserv.example.conf chanserv.example.conf global.example.conf memoserv.example.conf nickserv.example.conf chanstats.example.conf irc2sql.example.conf stats.standalone.example.conf)
 install(FILES ${DATA}
   DESTINATION ${CONF_DIR}
 )

data/anope.example.conf

@@ -1,8 +1,8 @@
 /*
- * Example configuration file for Services. After making the appropriate
- * changes to this file, place it in the Services conf directory (as
- * specified in the "configure" script, default /home/username/services/conf)
- * under the name "services.conf".
+ * Example configuration file for Anope. After making the appropriate
+ * changes to this file, place it in the Anope conf directory (as
+ * specified in the "Config" script, default /home/username/anope/conf)
+ * under the name "anope.conf".
  *
  * The format of this file is fairly simple: three types of comments are supported:
  *  - All text after a '#' on a line is ignored, as in shell scripting
@@ -53,7 +53,7 @@
  * included to indicate whether an option is required:
  *
  * [REQUIRED]
- *     Indicates a directive which must be given. Without it, Services will
+ *     Indicates a directive which must be given. Without it, Anope will
  *     not start.
  *
  * [RECOMMENDED]
@@ -71,7 +71,7 @@
  *
  * [DEPRECATED]
  *     Indicates a directive which will disappear in a future version of
- *     Services, usually because its functionality has been either
+ *     Anope, usually because its functionality has been either
  *     superseded by that of other directives or incorporated into the main
  *     program.
  */
@@ -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.
  */
 
 /*
@@ -90,7 +90,7 @@
 define
 {
 	name = "services.host"
-	value = "services.localhost.net"
+	value = "services.example.com"
 }
 
 /*
@@ -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/anope.conf"
 }
 
 /*
@@ -120,54 +120,63 @@ define
  * This section can be included multiple times, and Anope will attempt to
  * connect to each server until it finally connects.
  *
- * Each uplink IRCd should have a corresponding configuration to allow Services
+ * Each uplink IRCd should have a corresponding configuration to allow Anope
  * to link to it.
  *
  * 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!
+ *     <module name="hidechans">
+ *     <module name="services_account">
+ *     <module name="spanningtree">
+ *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <link name="services.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
- *     <bind address="127.0.0.1" port="7000" type="servers">
+ *     <uline server="services.example.com" silent="yes">
  *
  * 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 services.example.com {
+ *         incoming {
+ *             mask *@127.0.0.1;
+ *         };
+ *         password "mypassword";
+ *         class servers;
+ *     };
+ *     ulines { services.example.com; };
  */
 uplink
 {
 	/*
-	 * The IP or hostname of the IRC server you wish to connect Services to.
-	 * Usually, you will want to connect Services over 127.0.0.1 (aka localhost).
+	 * The IP address, hostname, or UNIX socket path of the IRC server you wish
+	 * to connect Anope to.
+	 * Usually, you will want to connect over 127.0.0.1 (aka localhost).
 	 *
 	 * NOTE: On some shell providers, this will not be an option.
 	 */
 	host = "127.0.0.1"
 
 	/*
-	 * Enable if Services should connect using IPv6.
+	 * The protocol that Anope should use when connecting to the uplink. Can
+	 * be set to "ipv4" (the default), "ipv6", or "unix".
 	 */
-	ipv6 = no
+	protocol = "ipv4"
 
 	/*
-	 * Enable if Services should connect using SSL.
+	 * Enable if Anope should connect using SSL.
 	 * You must have an SSL module loaded for this to work.
 	 */
 	ssl = no
@@ -193,26 +202,26 @@ uplink
 /*
  * [REQUIRED] Server Information
  *
- * This section contains information about the Services server.
+ * This section contains information about the services server.
  */
 serverinfo
 {
 	/*
-	 * The hostname that Services will be seen as, it must have no conflicts with any
+	 * The hostname that Anope will be seen as, it must have no conflicts with any
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "services.localhost.net"
+	name = "services.example.com"
 
 	/*
-	 * 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"
+	description = "Anope IRC Services"
 
 	/*
-	 * The local address that Services will bind to before connecting to the remote
-	 * server. This may be useful for multihomed hosts. If omitted, Services will let
+	 * The local address that Anope will bind to before connecting to the remote
+	 * server. This may be useful for multihomed hosts. If omitted, Anope will let
 	 * the Operating System choose the local address. This directive is optional.
 	 *
 	 * If you don't know what this means or don't need to use it, just leave this
@@ -228,16 +237,16 @@ serverinfo
 	#id = "00A"
 
 	/*
-	 * The filename containing the Services process ID. The path is relative to the
+	 * The filename containing the Anope process ID. The path is relative to the
 	 * services root directory.
 	 */
-	pid = "data/services.pid"
+	pid = "data/anope.pid"
 
 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/services.motd"
+	motd = "conf/motd.txt"
 }
 
 /*
@@ -248,18 +257,17 @@ serverinfo
  *
  * Supported:
  *  - bahamut
- *  - charybdis
  *  - hybrid
- *  - inspircd12
- *  - inspircd20
+ *  - inspircd
  *  - ngircd
  *  - plexus
  *  - ratbox
- *  - unreal
+ *  - solanum
+ *  - unrealircd
  */
 module
 {
-	name = "inspircd20"
+	name = "inspircd"
 
 	/*
 	 * Some protocol modules can enforce mode locks server-side. This reduces the spam caused by
@@ -281,32 +289,32 @@ module
 /*
  * [REQUIRED] Network Information
  *
- * This section contains information about the IRC network that Services will be
+ * This section contains information about the IRC network that Anope will be
  * connecting to.
  */
 networkinfo
 {
 	/*
-	 * This is the name of the network that Services will be running on.
+	 * This is the name of the network that Anope will be running on.
 	 */
 	networkname = "LocalNet"
 
 	/*
 	 * Set this to the maximum allowed nick length on your network.
 	 * Be sure to set this correctly, as setting this wrong can result in
-	 * Services being disconnected from the network.
+	 * Anope being disconnected from the network.
 	 */
 	nicklen = 31
 
 	/* Set this to the maximum allowed ident length on your network.
 	 * Be sure to set this correctly, as setting this wrong can result in
-	 * Services being disconnected from the network.
+	 * Anope being disconnected from the network.
 	 */
 	userlen = 10
 
 	/* Set this to the maximum allowed hostname length on your network.
 	 * Be sure to set this correctly, as setting this wrong can result in
-	 * Services being disconnected from the network.
+	 * Anope being disconnected from the network.
 	 */
 	hostlen = 64
 
@@ -322,7 +330,7 @@ networkinfo
 	/*
 	 * Characters allowed in nicknames. This always includes the characters described
 	 * in RFC1459, and so does not need to be set for normal behavior. Changing this to
-	 * include characters your IRCd doesn't support will cause your IRCd and/or Services
+	 * include characters your IRCd doesn't support will cause your IRCd and/or Anope
 	 * to break. Multibyte characters are not supported, nor are escape sequences.
 	 *
 	 * It is recommended you DON'T change this.
@@ -334,7 +342,7 @@ networkinfo
 	 * to services, such as BotServ bot hostnames and user vhosts. Changing this is not
 	 * recommended unless you know for sure your IRCd supports whatever characters you are
 	 * wanting to use. Telling services to set a vHost containing characters your IRCd
-	 * disallows could potentially break the IRCd and/or Services.
+	 * disallows could potentially break the IRCd and/or Anope.
 	 *
 	 * It is recommended you DON'T change this.
 	 */
@@ -359,22 +367,22 @@ networkinfo
 }
 
 /*
- * [REQUIRED] Services Options
+ * [REQUIRED] Anope Options
  *
- * This section contains various options which determine how Services will operate.
+ * This section contains various options which determine how Anope will operate.
  */
 options
 {
 	/*
 	 * On Linux/UNIX systems Anope can setuid and setgid to this user and group
-	 * after starting up. This is useful if Anope has to bind to privileged ports
+	 * after starting up. This is useful if Anope has to bind to privileged ports.
 	 */
 	#user = "anope"
 	#group = "anope"
 
 	/*
 	 * The case mapping used by services. This must be set to a valid locale name
-	 * installed on your machine. Services use this case map to compare, with
+	 * installed on your machine. Anope uses this case map to compare, with
 	 * case insensitivity, things such as nick names, channel names, etc.
 	 *
 	 * We provide two special casemaps shipped with Anope, ascii and rfc1459.
@@ -400,23 +408,11 @@ options
 	#seed = 9866235
 
 	/*
-	 * If set, Services will perform more stringent checks on passwords. If this
-	 * isn't set, Services will only disallow a password if it is the same as the
-	 * entity (nickname name) with which it is associated. When set, however,
-	 * Services will also check that the password is at least five
-	 * characters long, and in the future will probably check other things
-	 * as well.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	strictpasswords = yes
-
-	/*
-	 * Sets the number of invalid password tries before Services removes a user
+	 * Sets the number of invalid password tries before services removes a user
 	 * from the network. If a user enters a number of invalid passwords equal to
-	 * the given amount for any Services function or combination of functions
-	 * during a single IRC session (subject to badpasstimeout, below), Services
-	 * will issues a /KILL for the user. If not given, Services will ignore
+	 * the given amount for any services function or combination of functions
+	 * during a single IRC session (subject to badpasstimeout, below), services
+	 * will issues a /KILL for the user. If not given, services will ignore
 	 * failed password attempts (though they will be logged in any case).
 	 *
 	 * This directive is optional, but recommended.
@@ -458,7 +454,7 @@ options
 	/*
 	 * Sets the (maximum) frequency at which the timeout list is checked. This,
 	 * combined with readtimeout above, determines how accurately timed events,
-	 * such as nick kills, occur; it also determines how much CPU time Services
+	 * such as nick kills, occur; it also determines how much CPU time services
 	 * will use doing this. Higher values will cause less accurate timing but
 	 * less CPU usage.
 	 *
@@ -471,7 +467,7 @@ options
 	timeoutcheck = 3s
 
 	/*
-	 * If set, this will allow users to let Services send PRIVMSGs to them
+	 * If set, this will allow users to let services send PRIVMSGs to them
 	 * instead of NOTICEs. Also see the "msg" option of nickserv:defaults,
 	 * which also toggles the default communication (PRIVMSG or NOTICE) to
 	 * use for unregistered users.
@@ -484,8 +480,8 @@ options
 	#useprivmsg = yes
 
 	/*
-	 * If set, will force Services to only respond to PRIVMSGs addresses to
-	 * Nick@ServerName - e.g. NickServ@localhost.net. This should be used in
+	 * If set, will force services to only respond to PRIVMSGs addresses to
+	 * Nick@ServerName - e.g. NickServ@example.com. This should be used in
 	 * conjunction with IRCd aliases. This directive is optional.
 	 *
 	 * This option will have no effect on some IRCds, such as TS6 IRCds.
@@ -493,14 +489,14 @@ options
 	#usestrictprivmsg = yes
 
 	/*
-	 * If set, Services will only show /stats o to IRC Operators. This directive
+	 * If set, Anope will only show /stats o to IRC Operators. This directive
 	 * is optional.
 	 */
 	#hidestatso = yes
 
 	/*
-	 * A space-separated list of ulined servers on your network, it is assumed that
-	 * the servers in this list are allowed to set channel modes and Services will
+	 * 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 Anope will
 	 * not attempt to reverse their mode changes.
 	 *
 	 * WARNING: Do NOT put your normal IRC user servers in this directive.
@@ -515,13 +511,13 @@ options
 	retrywait = 60s
 
 	/*
-	 * If set, Services will hide commands that users don't have the privilege to execute
+	 * If set, services will hide commands that users don't have the privilege to execute
 	 * from HELP output.
 	 */
 	hideprivilegedcommands = yes
 
 	/*
-	 * If set, Services will hide commands that users can't execute because they are not
+	 * If set, services will hide commands that users can't execute because they are not
 	 * logged in from HELP output.
 	 */
 	hideregisteredcommands = yes
@@ -531,14 +527,14 @@ options
 	 *
 	 * Note for this to work the regex module providing the regex engine must be loaded.
 	 */
-	regexengine = "regex/pcre"
+	#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"
 
@@ -654,6 +650,8 @@ log
 	 *   - a channel name
 	 *   - a filename
 	 *   - globops
+	 *
+	 * If you specify a filename the current date in the format ".YYYYMMDD" will be appended to the path.
 	 */
 	target = "services.log"
 
@@ -667,19 +665,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.
 	 */
@@ -704,7 +702,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)
+	 *    pseudo-serv/commandname (e.g. operserv/akill, chanserv/set)
 	 *
 	 * Valid server options are:
 	 *    connect, quit, sync, squit
@@ -735,8 +733,9 @@ log
  */
 log
 {
+	bot = "Global"
 	target = "globops"
-	admin = "global/* 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"
+	admin = "global/* operserv/chankill operserv/mode operserv/kick operserv/akill operserv/s*line operserv/noop operserv/jupe operserv/set operserv/svsnick operserv/svsjoin operserv/svspart nickserv/getpass */drop"
 	servers = "squit"
 	users = "oper"
 	other = "expire/* bados akill/*"
@@ -761,20 +760,21 @@ 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
+ *  protected                     - Can not be kicked from channels by services
  *
  * Available commands:
  *   botserv/bot/del          botserv/bot/add               botserv/bot/change        botserv/set/private
@@ -783,22 +783,16 @@ log
  *   chanserv/drop            chanserv/getkey               chanserv/invite
  *   chanserv/list            chanserv/suspend              chanserv/topic
  *
- *   chanserv/saset/bantype   chanserv/saset/description    chanserv/saset/email       chanserv/saset/keepmodes
- *   chanserv/saset/founder   chanserv/saset/keeptopic      chanserv/saset/restricted
- *   chanserv/saset/peace     chanserv/saset/persist        chanserv/saset/private
- *   chanserv/saset/secure    chanserv/saset/securefounder  chanserv/saset/secureops
- *   chanserv/saset/signkick  chanserv/saset/successor      chanserv/saset/topiclock
- *   chanserv/saset/url       chanserv/saset/noexpire       chanserv/saset/autoop
+ *   chanserv/saset/noexpire
  *
  *   memoserv/sendall        memoserv/staff
  *
- *   nickserv/getpass        nickserv/getemail      nickserv/suspend      nickserv/ajoin
- *   nickserv/list
+ *   nickserv/getemail         nickserv/suspend       nickserv/ajoin           nickserv/list
  *
  *   nickserv/saset/autoop     nickserv/saset/email   nickserv/saset/greet     nickserv/saset/password
  *   nickserv/saset/display    nickserv/saset/kill    nickserv/saset/language  nickserv/saset/message
  *   nickserv/saset/private    nickserv/saset/secure  nickserv/saset/url       nickserv/saset/noexpire
- *   nickserv/saset/keepmodes
+ *   nickserv/saset/keepmodes  nickserv/saset/neverop
  *
  *   hostserv/set            hostserv/del           hostserv/list
  *
@@ -810,12 +804,15 @@ log
  *   operserv/oper         operserv/config       operserv/umode      operserv/logsearch
  *   operserv/modload      operserv/jupe         operserv/set        operserv/noop
  *   operserv/quit         operserv/update       operserv/reload     operserv/restart
- *   operserv/shutdown     operserv/svs          operserv/oline      operserv/kill
+ *   operserv/shutdown     operserv/svs          operserv/kill
  *
  * Firstly, we define 'opertypes' which are named whatever we want ('Network Administrator', etc).
  * 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.
@@ -835,7 +832,7 @@ opertype
 	/* The name of this opertype */
 	name = "Services Operator"
 
-	/* What opertype(s) this inherits from. Seperate with a comma. */
+	/* What opertype(s) this inherits from. Separate with a comma. */
 	inherits = "Helper, Another Helper"
 
 	/* What commands (see above) this opertype may use */
@@ -861,7 +858,7 @@ opertype
 
 	inherits = "Services Operator"
 
-	commands = "botserv/* chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svs operserv/stats operserv/oline operserv/noop operserv/forbid global/*"
+	commands = "botserv/* chanserv/access/list chanserv/drop chanserv/getkey chanserv/saset/noexpire memoserv/sendall nickserv/saset/* nickserv/getemail operserv/news operserv/jupe operserv/svs operserv/stats operserv/noop operserv/forbid global/*"
 
 	privs = "*"
 }
@@ -879,10 +876,10 @@ opertype
  * After defining different types of operators in the above opertype section, we now define who is in these groups
  * through 'oper' blocks, similar to ircd access.
  *
- * The default is to comment these out (so NOBODY will have Services access).
+ * The default is to comment these out (so NOBODY will have access).
  * You probably want to add yourself and a few other people at minimum.
  *
- * As with all permissions, make sure to only give trustworthy people access to Services.
+ * As with all permissions, make sure to only give trustworthy people access.
  */
 
 #oper
@@ -893,12 +890,12 @@ opertype
 	/* The opertype this person will have */
 	type = "Services Root"
 
-	/* If set, the user must be an oper on the IRCd to gain their Services
+	/* If set, the user must be an oper on the IRCd to gain their
 	 * oper privileges.
 	 */
 	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. */
@@ -928,7 +925,7 @@ opertype
 /*
  * [OPTIONAL] Mail Config
  *
- * This section contains settings related to the use of e-mail from Services.
+ * This section contains settings related to the use of e-mail from services.
  * If the usemail directive is set to yes, unless specified otherwise, all other
  * directives are required.
  *
@@ -939,7 +936,7 @@ opertype
 mail
 {
 	/*
-	 * If set, this option enables the mail commands in Services. You may choose
+	 * If set, this option enables the mail commands in Anope. You may choose
 	 * to disable it if you have no Sendmail-compatible mailer installed. Whilst
 	 * this directive (and entire block) is optional, it is required if
 	 * nickserv:registration is set to yes.
@@ -956,6 +953,9 @@ mail
 	 * it. This one usually needs no parameters on the command-line. Most
 	 * sendmail applications (or replacements of it) require the -t option
 	 * to be used.
+	 *
+	 * If you are running on Windows you should use a Windows sendmail port
+	 * like https://www.glob.com.au/sendmail/ for sending emails.
 	 */
 	sendmailpath = "/usr/sbin/sendmail -t"
 
@@ -963,14 +963,14 @@ mail
 	 * This is the e-mail address from which all the e-mails are to be sent from.
 	 * It should really exist.
 	 */
-	sendfrom = "services@localhost.net"
+	sendfrom = "services@example.com"
 
 	/*
 	 * This controls the minimum amount of time a user must wait before sending
 	 * another e-mail after they have sent one. It also controls the minimum time
 	 * a user must wait before they can receive another e-mail.
 	 *
-	 * This feature prevents users from being mail bombed using Services and
+	 * This feature prevents users from being mail bombed using services and
 	 * it is highly recommended that it be used.
 	 *
 	 * This directive is optional, but highly recommended.
@@ -978,7 +978,7 @@ mail
 	delay = 5m
 
 	/*
-	 * If set, Services will not attempt to put quotes around the TO: fields
+	 * If set, Anope will not put quotes around the TO: fields
 	 * in e-mails.
 	 *
 	 * This directive is optional, and as far as we know, it's only needed
@@ -986,8 +986,21 @@ mail
 	 */
 	#dontquoteaddresses = yes
 
+	/*
+	 * The content type to use when sending emails.
+	 *
+	 * This directive is optional, and is generally only needed if you want to
+	 * use HTML or non UTF-8 text in your services emails.
+	 */
+	#content_type = "text/plain; charset=UTF-8"
+
 	/*
 	 * 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,
@@ -1001,6 +1014,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,
@@ -1014,6 +1032,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,
@@ -1027,6 +1052,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,
@@ -1083,18 +1115,18 @@ module
 
 	/*
 	 * Sets the number of days backups of databases are kept. If you don't give it,
-	 * or if you set it to 0, Services won't backup the databases.
+	 * or if you set it to 0, Anope won't backup the databases.
 	 *
-	 * NOTE: Services must run 24 hours a day for this feature to work.
+	 * NOTE: Anope must run 24 hours a day for this feature to work.
 	 *
 	 * This directive is optional, but recommended.
 	 */
 	keepbackups = 3
 
 	/*
-	 * Allows Services to continue file write operations (i.e. database saving)
+	 * Allows Anope to continue file write operations (i.e. database saving)
 	 * even if the original file cannot be backed up. Enabling this option may
-	 * allow Services to continue operation under conditions where it might
+	 * allow Anope to continue operation under conditions where it might
 	 * otherwise fail, such as a nearly-full disk.
 	 *
 	 * NOTE: Enabling this option can cause irrecoverable data loss under some
@@ -1166,7 +1198,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
@@ -1205,29 +1237,23 @@ module
  * encrypted by this module. Old passwords stored in another encryption method are
  * automatically re-encrypted by the primary encryption module on next identify.
  *
- * NOTE: enc_old is Anope's previous (broken) MD5 implementation which is present in
- * versions prior to Anope 1.7.17. If your databases were made using that module,
- * use this and not enc_md5.
- *
- * NOTE: enc_sha1 relies on how the OS stores 2+ byte data internally, and is
- * potentially broken when moving between 2 different OSes, such as moving from
- * Linux to Windows. It is recommended that you use enc_sha256 instead if you want
- * to use an SHA-based encryption. If you choose to do so, it is also recommended
- * that you first try to get everyone's passwords converted to enc_sha256 before
- * switching OSes by placing enc_sha256 at the beginning of the list.
+ * enc_md5, enc_sha1, and enc_old are deprecated, and are provided for users
+ * to upgrade to a newer encryption module. Do not use them as the primary
+ * encryption module. They will be removed in a future release.
  *
  */
 
 #module { name = "enc_bcrypt" }
 module { name = "enc_sha256" }
-#module { name = "enc_md5" }
-#module { name = "enc_sha1" }
 
-/*
- * When using enc_none, passwords will be stored without encryption. This isn't secure
- * therefore it is not recommended.
- */
+ /*
+ * [DEPRECATED] Deprecated encryption modules. You can only use these for compatibility with
+ * old databases and will need to load one of the above modules as your primary encryption
+ * module.
+  */
+#module { name = "enc_md5" }
 #module { name = "enc_none" }
+#module { name = "enc_sha1" }
 
 /*
  * enc_old is Anope's previous (broken) MD5 implementation used from 1.4.x to 1.7.16.

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
@@ -89,6 +89,8 @@ module
 	 * -       noautoop: Disables autoop on the channel
 	 * -  cs_keep_modes: Enables keep modes on the channel, which retains modes when the channel is
 	 *                     not in use.
+	 * -   cs_no_expire: Enables no expire. Needs founder, successor (if set) or anyone in the access list
+	 *                   to be a registered nick, otherwise the channel will be dropped.
 	 * -           none: No defaults
 	 *
 	 * This directive is optional, if left blank, the options will default to keeptopic, cs_secure, securefounder,
@@ -108,9 +110,9 @@ module
 	 * The length of time before a channel registration expires.
 	 *
 	 * This directive is optional, but recommended.
-	 * If not set, the default is 14 days.
+	 * If not set, the default is 30 days.
 	 */
-	expire = 14d
+	expire = 30d
 
 	/*
 	 * The maximum number of entries on a channel's access list.
@@ -193,12 +195,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 +422,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
@@ -665,7 +667,7 @@ privilege
 	rank = 300
 	level = 10
 	flag = "a"
-	xop = "AOP"
+	xop = "SOP"
 }
 
 /*
@@ -692,7 +694,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 +838,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 +943,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 +1057,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
@@ -1121,9 +1123,6 @@ module
 
 	/* Sets the time to keep seen entries in the seen database. */
 	purgetime = "30d"
-
-	/* Sets the delay between checks for expired seen entries. */
-	expiretimeout = "1d"
 }
 command { service = "OperServ"; name = "SEEN"; command = "operserv/seen"; permission = "operserv/seen"; }
 
@@ -1166,7 +1165,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
@@ -1290,7 +1289,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.
  *
@@ -1312,7 +1311,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.chk

@@ -9,16 +9,16 @@
 ###############################################################
 
 # Anope binary directory
-ANOPATH=/home/ircd/services/bin
+ANOPATH=/home/ircd/anope/bin
 
 # Anope data directory
-ANODATA=/home/ircd/services/data
+ANODATA=/home/ircd/anope/data
 
 # Name of the pid file
-ANOPIDF=services.pid
+ANOPIDF=anope.pid
 
 # Name of the executable
-ANOPROG=services
+ANOPROG=anope
 
 # Parameters to pass to the executable
 ANOARGS=""

data/global.example.conf

@@ -66,15 +66,15 @@ module
 	client = "Global"
 
 	/*
-	 * This is the global message that will be sent when Services are being
+	 * This is the global message that will be sent when Anope is being
 	 * shutdown/restarted.
 	 *
 	 * This directive is optional.
 	 */
-	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
+	#globaloncycledown = "Services are restarting, they will be back shortly - please be good while they're gone"
 
 	/*
-	 * This is the global message that will be sent when Services (re)join the
+	 * This is the global message that will be sent when Anope (re)joins the
 	 * network.
 	 *
 	 * This directive is optional.
@@ -82,7 +82,7 @@ module
 	#globaloncycleup = "Services are now back online - have a nice day"
 
 	/*
-	 * If set, Services will hide the IRC Operator's nick in a global
+	 * If set, Anope will hide the IRC Operator's nick in a global
 	 * message/notice.
 	 *
 	 * This directive is optional.

data/hostserv.example.conf

@@ -110,12 +110,12 @@ module
 	/*
 	 * Upon nickserv/group, this option syncs the nick's main vHost to the grouped nick.
 	 */
-	syncongroup = false
+	syncongroup = true
 
 	/*
 	 * This makes vhosts act as if they are per account.
 	 */
-	synconset = false
+	synconset = true
 }
 command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }
 
@@ -161,13 +161,13 @@ module
 	name = "hs_request"
 
 	/*
-	 * If set, Services will send a memo to the user requesting a vHost when it's been
+	 * If set, Anope will send a memo to the user requesting a vHost when it's been
 	 * approved or rejected.
 	 */
 	#memouser = yes
 
 	/*
-	 * If set, Services will send a memo to all Services staff when a new vHost is requested.
+	 * If set, Anope will send a memo to all services staff when a new vHost is requested.
 	 */
 	#memooper = yes
 }

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

@@ -3,7 +3,7 @@
  *
  * The following blocks are used to load all non-core modules, including 3rd-party modules.
  * Modules can be prevented from loading by commenting out the line, other modules can be added by
- * adding a module block. These modules will be loaded prior to Services connecting to your network.
+ * adding a module block. These modules will be loaded prior to Anope connecting to your network.
  *
  * Note that some of these modules are labeled EXTRA, and must be enabled prior to compiling by
  * running the 'extras' script on Linux and UNIX.
@@ -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"
@@ -91,14 +91,14 @@ module { name = "help" }
 	name = "m_dnsbl"
 
 	/*
-	 * If set, Services will check clients against the DNSBLs when services connect to its uplink.
+	 * If set, Anope will check clients against the DNSBLs when services connect to its uplink.
 	 * This is not recommended, and on large networks will open a very large amount of DNS queries.
 	 * Whilst services are not drastically affected by this, your nameserver/DNSBL might care.
 	 */
 	check_on_connect = no
 
 	/*
-	 * If set, Services will check clients when coming back from a netsplit. This can cause a large number
+	 * If set, Anope will check clients when coming back from a netsplit. This can cause a large number
 	 * of DNS queries open at once. Whilst services are not drastically affected by this, your nameserver/DNSBL
 	 * might care.
 	 */
@@ -127,9 +127,9 @@ 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 relies are configured, all replies get banned. */
+		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		reply
 		{
 			code = 1
@@ -171,11 +171,11 @@ 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 */
-	exempt { ip = "127.0.0.1" }
+	exempt { ip = "127.0.0.0/8" }
 }
 
 /*
@@ -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"
@@ -243,7 +244,6 @@ module { name = "help" }
 	ldap
 	{
 		server = "ldap://127.0.0.1"
-		port = 389
 
 		/*
 		 * Admin credentials used for performing searches and adding users.
@@ -299,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"
 }
 
 /*
@@ -319,7 +319,7 @@ module { name = "help" }
  * This module dynamically ties users to Anope opertypes when they identify
  * via LDAP group membership. Requires m_ldap.
  *
- * Note that this doesn't give the user privileges on the IRCd, only in Services.
+ * Note that this doesn't give the user privileges on the IRCd, only in Anope.
  */
 #module
 {
@@ -374,6 +374,7 @@ module { name = "help" }
 		port = 3306
 	}
 }
+
 /*
  * m_redis
  *
@@ -402,10 +403,18 @@ module { name = "help" }
 /*
  * m_regex_pcre [EXTRA]
  *
- * Provides the regex engine regex/pcre, which uses the Perl Compatible Regular Expressions library.
+ * Provides the regex engine regex/pcre, which uses version 1 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre2 module.
  */
 #module { name = "m_regex_pcre" }
 
+/*
+ * m_regex_pcre2 [EXTRA]
+ *
+ * Provides the regex engine regex/pcre, which uses version 2 of the Perl Compatible Regular
+ * Expressions library. This can not be loaded at the same time as the m_regex_pcre module.
+#module { name = "m_regex_pcre2" }
+
 /*
  * m_regex_posix [EXTRA]
  *
@@ -438,7 +447,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 *"
@@ -536,30 +545,12 @@ module { name = "help" }
 /*
  * m_sasl
  *
- * Some IRCds allow "SASL" authentication to let users identify to Services
- * during the IRCd user registration process. If this module is loaded, Services will allow
+ * Some IRCds allow "SASL" authentication to let users identify to services
+ * during the IRCd user registration process. If this module is loaded, Anope will allow
  * authenticating users through this mechanism. Supported mechanisms are:
  * PLAIN, EXTERNAL.
  */
-#module { name = "m_sasl" }
-
-/*
- * m_sasl_dh-aes [EXTRA]
- *
- * Add the DH-AES mechanism to SASL.
- * Requires m_sasl to be loaded.
- * Requires openssl.
- */
-#module { name = "m_sasl_dh-aes" }
-
-/*
- * m_sasl_dh-blowfish [EXTRA]
- *
- * Add the DH-BLOWFISH mechanism to SASL.
- * Requires m_sasl to be loaded.
- * Requires openssl.
- */
-#module { name = "m_sasl_dh-blowfish" }
+module { name = "m_sasl" }
 
 /*
  * m_ssl_gnutls [EXTRA]
@@ -567,7 +558,7 @@ module { name = "help" }
  * 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
 {
@@ -605,7 +596,7 @@ module { name = "help" }
  * 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
@@ -674,13 +665,13 @@ module { name = "help" }
 	 * 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"
 }
 
 /*
@@ -718,7 +709,7 @@ module { name = "help" }
 
 	/* Query to execute to determine if a user should have operator privileges.
 	 * A field named opertype must be returned in order to link the user to their oper type.
-	 * The oper types must be configured earlier in services.conf.
+	 * The oper types must be configured earlier in anope.conf.
 	 *
 	 * If a field named modes is returned from this query then those modes are set on the user.
 	 * Without this, only a simple +o is sent.

data/nickserv.example.conf

@@ -79,7 +79,7 @@ module
 	confirmemailchanges = no
 
 	/*
-	 * A message sent to users on connect if they use an unregistered nick.
+	 * A message sent to users on connect if they use an unregistered nick. %n will be replaced with the user's nickname.
 	 *
 	 * This directive is optional.
 	 */
@@ -92,26 +92,31 @@ module
 	 *
 	 * The options are:
 	 * -   killprotect: Kill nick if not identified within 60 seconds
-	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the above
-	 *                    option and the above must be specified with this one
+	 * -    kill_quick: Kill nick if not identified within 20 seconds, this one overrides the killprotect
+	 *                    option and the killprotect option must be specified with this one
+	 * -    kill_immed: Kill nick immediately if not identified, this one overrides both the killprotect
+	 *                    and kill_quick options and the killprotect option must be specified with this one
 	 * -     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
 	 * -        autoop: User will be automatically opped in channels they enter and have access to
-	 * -           msg: Services messages will be sent as PRIVMSGs instead of NOTICEs, requires
-	 *                    options:useprivmsg to be enabled as well
-	 * -  ns_keepmodes: Enables keepmodes, which retains user modes across sessions
+	 * -       neverop: User can not be added to access lists
+	 * -           msg: Messages will be sent as PRIVMSGs instead of NOTICEs, requires options:useprivmsg
+	 *                  to be enabled as well
+	 * - ns_keep_modes: Enables keepmodes, which retains user modes across sessions
+	 * -  ns_no_expire: Enables no expire. Unconfirmed expire overrules this.
 	 *
 	 * This directive is optional, if left blank, the options will default to ns_secure, memo_signon, and
 	 * memo_receive. If you really want no defaults, use "none" by itself as the option.
 	 */
-	defaults = "ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
+	defaults = "killprotect ns_secure ns_private hide_email hide_mask memo_signon memo_receive autoop"
 
 	/*
 	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
@@ -122,20 +127,20 @@ module
 	/*
 	 * The length of time before a nick's registration expires.
 	 *
-	 * This directive is optional, but recommended. If not set, the default is 21 days.
+	 * This directive is optional, but recommended. If not set, the default is 90 days.
 	 */
-	expire = 21d
+	expire = 90d
 
 	/*
-	 * Prevents the use of the ACCESS and CERT (excluding their LIST subcommand), DROP, FORBID, SUSPEND,
-	 * GETPASS and SET PASSWORD commands by services operators on other services operators.
+	 * Prevents the use of the ACCESS and CERT (excluding their LIST subcommand), DROP, FORBID, SUSPEND
+	 * and SET PASSWORD commands by services operators on other services operators.
 	 *
 	 * This directive is optional, but recommended.
 	 */
 	secureadmins = yes
 
 	/*
-	 * If set, Services will set the channel modes a user has access to upon identifying, assuming
+	 * If set, Anope will set the channel modes a user has access to upon identifying, assuming
 	 * they are not already set.
 	 *
 	 * This directive is optional.
@@ -143,14 +148,14 @@ module
 	modeonid = yes
 
 	/*
-	 * If set, Services will set these user modes on any user who identifies.
+	 * If set, Anope will set these user modes on any user who identifies.
 	 *
 	 * This directive is optional.
 	 */
 	#modesonid = "+R"
 
 	/*
-	 * If set, Services will not show netsplits in the last quit message field
+	 * If set, Anope will not show netsplits in the last quit message field
 	 * of NickServ's INFO command.
 	 */
 	hidenetsplitquit = no
@@ -164,7 +169,7 @@ module
 
 	/*
 	 * If set, forbids the registration of nicks that contain an existing
-	 * nick with Services access. For example, if Tester is a Services Oper,
+	 * nick with services access. For example, if Tester is a Services Oper,
 	 * you can't register NewTester or Tester123 unless you are an IRC
 	 * Operator.
 	 *
@@ -177,14 +182,14 @@ module
 	#restrictopernicks = yes
 
 	/*
-	 * The username, and possibly hostname, used for fake users created when Services needs to
+	 * The username, and possibly hostname, used for fake users created when Anope needs to
 	 * hold a nickname.
 	 */
 	enforceruser = "enforcer"
 	enforcerhost = "services.host"
 
 	/*
-	 * The length of time Services hold nicknames.
+	 * The length of time Anope should hold nicknames for.
 	 *
 	 * This directive is optional, but recommended. If not set it defaults to 1 minute.
 	 */
@@ -200,16 +205,23 @@ module
 	guestnickprefix = "Guest"
 
 	/*
-	 * If set, Services do not allow ownership of nick names, only ownership of accounts.
+	 * If set, Anope does not allow ownership of nick names, only ownership of accounts.
 	 */
 	nonicknameownership = no
 
+	/*
+	 * The minimum length of passwords
+	 *
+	 * This directive is optional. If not set it defaults to 8.
+	 */
+	minpasslen = 8
+
 	/*
 	 * The maximum length of passwords
 	 *
 	 * This directive is optional. If not set it defaults to 32.
 	 */
-	passlen = 32
+	maxpasslen = 32
 }
 
 /*
@@ -255,12 +267,12 @@ module
 	accessmax = 32
 
 	/*
-	 * If set, Services will add the usermask of registering users to the access list of their
+	 * If set, Anope will add the usermask of registering users to the access list of their
 	 * newly created account. If not set, users will always have to identify to NickServ before
 	 * being recognized, unless they manually add an address to the access list of their account.
 	 * This directive is optional.
 	 */
-	addaccessonreg = yes
+	addaccessonreg = no
 }
 command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }
 
@@ -331,18 +343,6 @@ command { service = "NickServ"; name = "DROP"; command = "nickserv/drop"; }
 module { name = "ns_getemail" }
 command { service = "NickServ"; name = "GETEMAIL"; command = "nickserv/getemail"; permission = "nickserv/getemail"; group = "nickserv/admin"; }
 
-/*
- * ns_getpass
- *
- * Provides the command nickserv/getpass.
- *
- * Used for getting users passwords.
- *
- * Requires no encryption is being used.
- */
-#module { name = "ns_getpass" }
-#command { service = "NickServ"; name = "GETPASS"; command = "nickserv/getpass"; permission = "nickserv/getpass"; }
-
 /*
  * ns_group
  *
@@ -381,7 +381,15 @@ command { service = "NickServ"; name = "UNGROUP"; command = "nickserv/ungroup";
  *
  * Used for identifying to accounts.
  */
-module { name = "ns_identify" }
+module
+{
+	name = "ns_identify"
+
+	/*
+	 * If set, limits the number of concurrent users that can be logged in as a given account at once.
+	 */
+	maxlogins = 10
+}
 command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; hide = true; }
 command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"; }
 
@@ -390,7 +398,7 @@ command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"
  *
  * Provides the commands:
  * nickserv/info. - Used for gathering information about an account.
- * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publically shown in nickserv/info.
+ * nickserv/set/hide, nickserv/saset/hide - Used for configuring which options are publicly shown in nickserv/info.
  *
  */
 module { name = "ns_info" }
@@ -445,17 +453,18 @@ module
 	name = "ns_recover"
 
 	/*
-	 * If set, Services will svsnick and svsjoin users who use the recover
+	 * If set, Anope 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
 }
 command { service = "NickServ"; name = "RECOVER"; command = "nickserv/recover"; }
-# Uncomment below to emulate 1.8's behavior of ghost and release.
-#command { service = "NickServ"; name = "GHOST"; command = "nickserv/recover"; }
-#command { service = "NickServ"; name = "RELEASE"; command = "nickserv/recover"; }
+
+# For compatibility with Anope 1.8 and Atheme.
+command { service = "NickServ"; name = "GHOST"; command = "nickserv/recover"; hide = true; }
+command { service = "NickServ"; name = "RELEASE"; command = "nickserv/recover"; hide = true; }
 
 /*
  * ns_register
@@ -524,6 +533,7 @@ command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpas
  *   nickserv/set/message, nickserv/saset/message - Used to configure how services send messages to you.
  *   nickserv/set/password, nickserv/saset/password  - Used for changing a users password.
  *   nickserv/set/secure, nickserv/saset/secure - Used for configuring whether a user can identify by simply being recognized by nickserv/access.
+ *   nickserv/set/neverop, nickserv/saset/neverop - Used to configure whether a user can be added to access lists
  *   nickserv/saset/noexpire - Used for configuring noexpire, which prevents nicks from expiring.
  */
 module
@@ -568,6 +578,9 @@ command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/sas
 command { service = "NickServ"; name = "SET SECURE"; command = "nickserv/set/secure"; }
 command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; }
 
+command { service = "NickServ"; name = "SET NEVEROP"; command = "nickserv/set/neverop"; }
+command { service = "NickServ"; name = "SASET NEVEROP"; command = "nickserv/saset/neverop"; permission = "nickserv/saset/neverop"; }
+
 command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; }
 
 
@@ -582,12 +595,13 @@ command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/sas
 module { name = "ns_set_misc" }
 command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; misc_description = _("Associate a URL with your account"); }
 command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; misc_description = _("Associate an ICQ account with your account"); }
-#command { service = "NickServ"; name = "SASET ICQ"; command = "nickserv/saset/misc"; misc_description = _("Associate an ICQ account with this account"); permission = "nickserv/saset/icq"; group = "nickserv/admin"; }
-#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); }
-#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET DISCORD"; command = "nickserv/set/misc"; misc_description = _("Associate a Discord account with your account"); }
+#command { service = "NickServ"; name = "SASET DISCORD"; command = "nickserv/saset/misc"; misc_description = _("Associate a Discord account with this account"); permission = "nickserv/saset/discord"; group = "nickserv/admin"; }
 #command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); }
 #command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; }
+#command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); }
+#command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; }
+
 
 /*
  * ns_status

data/operserv.example.conf

@@ -75,7 +75,7 @@ module
 	sqlineexpiry = 30d
 
 	/*
-	 * If set, this option will make Services send an AKILL command immediately after it has been
+	 * If set, this option will make Anope send an AKILL command immediately after it has been
 	 * added with AKILL ADD. This eliminates the need for killing the user after the AKILL has
 	 * been added.
 	 *
@@ -84,7 +84,7 @@ module
 	akillonadd = yes
 
 	/*
-	 * If set, this option will make Services send an (SVS)KILL command immediately after SNLINE ADD.
+	 * If set, this option will make Anope send an (SVS)KILL command immediately after SNLINE ADD.
 	 * This eliminates the need for killing the user after the SNLINE has been added.
 	 *
 	 * This directive is optional.
@@ -92,7 +92,7 @@ module
 	killonsnline = yes
 
 	/*
-	 * If set, this option will make Services send an (SVS)KILL command immediately after SQLINE ADD.
+	 * If set, this option will make Anope send an (SVS)KILL command immediately after SQLINE ADD.
 	 * This eliminates the need for killing the user after the SQLINE has been added.
 	 *
 	 * This directive is optional.
@@ -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
@@ -167,7 +167,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 	name = "os_defcon"
 
 	/*
-	 * Default DefCon level (1-5) to use when starting Services up. Level 5 constitutes normal operation
+	 * Default DefCon level (1-5) to use when starting Anope up. Level 5 constitutes normal operation
 	 * while level 1 constitutes the most restrictive operation. If this setting is left out or set to
 	 * 0, DefCon will be disabled and the rest of this block will be ignored.
 	 */
@@ -184,8 +184,8 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 	 * - forcechanmodes: Forces all channels to have the modes given in the later chanmodes directive
 	 * - reducedsessions: Reduces the session limit to the value given in the later sessionlimit directive
 	 * - nonewclients: KILL any new clients trying to connect
-	 * - operonly: Services will ignore all non-IRCops
-	 * - silentoperonly: Services will silently ignore all non-IRCops
+	 * - operonly: Ignore all non-IRCops
+	 * - silentoperonly: Silently ignore all non-IRCops
 	 * - akillnewclients: AKILL any new clients trying to connect
 	 * - nonewmemos: No new memos will be sent to block MemoServ attacks
 	 */
@@ -209,7 +209,7 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 	 * The channel modes to set on all channels when the DefCon channel mode system is in use.
 	 *
 	 * Note 1: Choose these modes carefully, because when DefCon switches to a level which does NOT have
-	 * the mode setting selected, Services will set the reverse on all channels, e.g. if this setting
+	 * the mode setting selected, Anope will set the reverse on all channels, e.g. if this setting
 	 * is +RN when DefCon is used, all channels will be set to +RN, when DefCon is removed, all
 	 * channels will be set to -RN. You don't want to set this to +k for example, because when DefCon
 	 * is removed, all channels are set -k, removing the key from previously keyed channels.
@@ -227,14 +227,14 @@ command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"
 	#timeout = 15m
 
 	/*
-	 * If set, Services will send a global message on DefCon level changes.
+	 * If set, Anope will send a global message on DefCon level changes.
 	 *
 	 * This directive is optional.
 	 */
 	#globalondefcon = yes
 
 	/*
-	 * If set, Services will send the global message defined in the message directive on DefCon level
+	 * If set, Anope will send the global message defined in the message directive on DefCon level
 	 * changes.
 	 *
 	 * This directive is optional.
@@ -348,7 +348,7 @@ command { service = "OperServ"; name = "FORBID"; command = "operserv/forbid"; pe
  *
  * Provides the command operserv/ignore.
  *
- * Used to make Services ignore users.
+ * Used to make Anope ignore users.
  */
 module { name = "os_ignore" }
 command { service = "OperServ"; name = "IGNORE"; command = "operserv/ignore"; permission = "operserv/ignore"; }
@@ -506,17 +506,6 @@ command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomn
 module { name = "os_noop" }
 command { service = "OperServ"; name = "NOOP"; command = "operserv/noop"; permission = "operserv/noop"; }
 
-/*
- * os_oline
- *
- * Provides the command operserv/oline.
- *
- * Used to set oper flags on users, and is specific to UnrealIRCd.
- * See /helpop ?svso on your IRCd for more information.
- */
-module { name = "os_oline" }
-command { service = "OperServ"; name = "OLINE"; command = "operserv/oline"; permission = "operserv/oline"; }
-
 /*
  * os_oper
  *
@@ -532,7 +521,7 @@ command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permis
  *
  * Provides the command operserv/reload.
  *
- * Used to reload the services.conf configuration file.
+ * Used to reload the anope.conf configuration file.
  */
 module { name = "os_reload" }
 command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }
@@ -544,7 +533,7 @@ command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; pe
  *
  * This module enables session limiting. Session limiting prevents users from connecting more than a certain
  * number of times from the same IP at the same time - thus preventing most types of cloning.
- * Once a host reaches it's session limit, all clients attempting to connect from that host will
+ * Once a host reaches its session limit, all clients attempting to connect from that host will
  * be killed. Exceptions to the default session limit can be defined via the exception list.
  *
  * Used to manage the session limit exception list, and view currently active sessions.
@@ -559,7 +548,7 @@ module
 	 *
 	 * This directive is required if os_session is loaded.
 	 */
-	defaultsessionlimit = 3
+	defaultsessionlimit = 5
 
 	/*
 	 * The maximum session limit that may be set for a host in an exception.
@@ -570,10 +559,8 @@ module
 
 	/*
 	 * Sets the default expiry time for session exceptions.
-	 *
-	 * This directive is required if os_session is loaded.
 	 */
-	exceptionexpiry = 1d
+	#exceptionexpiry = 1d
 
 	/*
 	 * The message that will be NOTICE'd to a user just before they are removed from the network because
@@ -594,10 +581,10 @@ 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
+	 * If set and is not 0, this directive tells Anope to add an AKILL if the number of subsequent kills
 	 * for the same host exceeds this value, preventing the network from experiencing KILL floods.
 	 *
 	 * This directive is optional.

data/stats.standalone.example.conf

@@ -1,8 +1,8 @@
 /*
- * Example configuration file for Services. After making the appropriate
- * changes to this file, place it in the Services conf directory (as
- * specified in the "configure" script, default /home/username/services/conf)
- * under the name "services.conf".
+ * Example configuration file for Anope. After making the appropriate
+ * changes to this file, place it in the Anope conf directory (as
+ * specified in the "Config" script, default /home/username/anope/conf)
+ * under the name "anope.conf".
  *
  * The format of this file is fairly simple: three types of comments are supported:
  *  - All text after a '#' on a line is ignored, as in shell scripting
@@ -53,7 +53,7 @@
  * included to indicate whether an option is required:
  *
  * [REQUIRED]
- *     Indicates a directive which must be given. Without it, Services will
+ *     Indicates a directive which must be given. Without it, Anope will
  *     not start.
  *
  * [RECOMMENDED]
@@ -71,7 +71,7 @@
  *
  * [DEPRECATED]
  *     Indicates a directive which will disappear in a future version of
- *     Services, usually because its functionality has been either
+ *     Anope, usually because its functionality has been either
  *     superseded by that of other directives or incorporated into the main
  *     program.
  */
@@ -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.example.com"
 }
 
 /*
@@ -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"
 }
 
 /*
@@ -120,54 +120,60 @@ define
  * This section can be included multiple times, and Anope will attempt to
  * connect to each server until it finally connects.
  *
- * Each uplink IRCd should have a corresponding configuration to allow Services
+ * Each uplink IRCd should have a corresponding configuration to allow Anope
  * to link to it.
  *
  * 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.example.com"
  *           ipaddr="127.0.0.1"
  *           port="7000"
  *           sendpass="mypassword"
  *           recvpass="mypassword">
- *     <uline server="services.localhost.net" silent="yes">
+ *     <uline server="stats.example.com" 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.example.com {
+ *         incoming {
+ *             mask *@127.0.0.1;
+ *         };
+ *         password "mypassword";
+ *         class servers;
+ *     };
+ *     ulines { stats.example.com; };
  */
 uplink
 {
 	/*
-	 * The IP or hostname of the IRC server you wish to connect Services to.
-	 * Usually, you will want to connect Services over 127.0.0.1 (aka localhost).
+	 * The IP address, hostname, or UNIX socket path of the IRC server you wish
+	 * to connect Anope to.
+	 * Usually, you will want to connect over 127.0.0.1 (aka localhost).
 	 *
 	 * NOTE: On some shell providers, this will not be an option.
 	 */
 	host = "127.0.0.1"
 
 	/*
-	 * Enable if Services should connect using IPv6.
+	 * The protocol that Anope should use when connecting to the uplink. Can
+	 * be set to "ipv4" (the default), "ipv6", or "unix".
 	 */
-	ipv6 = no
+	protocol = "ipv4"
 
 	/*
-	 * Enable if Services should connect using SSL.
+	 * Enable if Anope should connect using SSL.
 	 * You must have an SSL module loaded for this to work.
 	 */
 	ssl = no
@@ -193,26 +199,26 @@ uplink
 /*
  * [REQUIRED] Server Information
  *
- * This section contains information about the Services server.
+ * This section contains information about the services server.
  */
 serverinfo
 {
 	/*
-	 * The hostname that Services will be seen as, it must have no conflicts with any
+	 * The hostname that Anope will be seen as, it must have no conflicts with any
 	 * other server names on the rest of your IRC network. Note that it does not have
 	 * to be an existing hostname, just one that isn't on your network already.
 	 */
-	name = "stats.localhost.net"
+	name = "stats.example.com"
 
 	/*
-	 * 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"
+	description = "Anope IRC Statistics"
 
 	/*
-	 * The local address that Services will bind to before connecting to the remote
-	 * server. This may be useful for multihomed hosts. If omitted, Services will let
+	 * The local address that Anope will bind to before connecting to the remote
+	 * server. This may be useful for multihomed hosts. If omitted, Anope will let
 	 * the Operating System choose the local address. This directive is optional.
 	 *
 	 * If you don't know what this means or don't need to use it, just leave this
@@ -228,16 +234,16 @@ serverinfo
 	#id = "00A"
 
 	/*
-	 * The filename containing the Services process ID. The path is relative to the
+	 * The filename containing the Anope process ID. The path is relative to the
 	 * services root directory.
 	 */
-	pid = "data/services.pid"
+	pid = "data/anope.pid"
 
 	/*
 	 * The filename containing the Message of the Day. The path is relative to the
 	 * services root directory.
 	 */
-	motd = "conf/services.motd"
+	motd = "conf/motd.txt"
 }
 
 /*
@@ -248,49 +254,48 @@ serverinfo
  *
  * Supported:
  *  - bahamut
- *  - charybdis
  *  - hybrid
- *  - inspircd12
- *  - inspircd20
+ *  - inspircd
  *  - ngircd
  *  - plexus
  *  - ratbox
- *  - unreal
+ *  - solanum
+ *  - unrealircd
  */
 module
 {
-	name = "inspircd20"
+	name = "inspircd"
 }
 
 /*
  * [REQUIRED] Network Information
  *
- * This section contains information about the IRC network that Services will be
+ * This section contains information about the IRC network that Anope will be
  * connecting to.
  */
 networkinfo
 {
 	/*
-	 * This is the name of the network that Services will be running on.
+	 * This is the name of the network that Anope will be running on.
 	 */
 	networkname = "LocalNet"
 
 	/*
 	 * Set this to the maximum allowed nick length on your network.
 	 * Be sure to set this correctly, as setting this wrong can result in
-	 * Services being disconnected from the network.
+	 * Anope being disconnected from the network.
 	 */
 	nicklen = 31
 
 	/* Set this to the maximum allowed ident length on your network.
 	 * Be sure to set this correctly, as setting this wrong can result in
-	 * Services being disconnected from the network.
+	 * Anope being disconnected from the network.
 	 */
 	userlen = 10
 
 	/* Set this to the maximum allowed hostname length on your network.
 	 * Be sure to set this correctly, as setting this wrong can result in
-	 * Services being disconnected from the network.
+	 * Anope being disconnected from the network.
 	 */
 	hostlen = 64
 
@@ -308,7 +313,7 @@ networkinfo
 	 * to services, such as BotServ bot hostnames and user vhosts. Changing this is not
 	 * recommended unless you know for sure your IRCd supports whatever characters you are
 	 * wanting to use. Telling services to set a vHost containing characters your IRCd
-	 * disallows could potentially break the IRCd and/or Services.
+	 * disallows could potentially break the IRCd and/or Anope.
 	 *
 	 * It is recommended you DON'T change this.
 	 */
@@ -333,22 +338,22 @@ networkinfo
 }
 
 /*
- * [REQUIRED] Services Options
+ * [REQUIRED] Anope Options
  *
- * This section contains various options which determine how Services will operate.
+ * This section contains various options which determine how Anope will operate.
  */
 options
 {
 	/*
 	 * On Linux/UNIX systems Anope can setuid and setgid to this user and group
-	 * after starting up. This is useful if Anope has to bind to privileged ports
+	 * after starting up. This is useful if Anope has to bind to privileged ports.
 	 */
 	#user = "anope"
 	#group = "anope"
 
 	/*
 	 * The case mapping used by services. This must be set to a valid locale name
-	 * installed on your machine. Services use this case map to compare, with
+	 * installed on your machine. Anope uses this case map to compare, with
 	 * case insensitivity, things such as nick names, channel names, etc.
 	 *
 	 * We provide two special casemaps shipped with Anope, ascii and rfc1459.
@@ -372,14 +377,14 @@ options
 	warningtimeout = 4h
 
 	/*
-	 * If set, Services will only show /stats o to IRC Operators. This directive
+	 * If set, Anope will only show /stats o to IRC Operators. This directive
 	 * is optional.
 	 */
 	#hidestatso = yes
 
 	/*
-	 * A space-separated list of ulined servers on your network, it is assumed that
-	 * the servers in this list are allowed to set channel modes and Services will
+	 * 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 Anope will
 	 * not attempt to reverse their mode changes.
 	 *
 	 * WARNING: Do NOT put your normal IRC user servers in this directive.
@@ -411,17 +416,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 +437,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 +466,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 +515,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://github.com/anope/anope/issues

docs/C++CASTING

@@ -21,7 +21,7 @@ The syntax is usually *_cast<type>(var).
 static_cast
 -----------
 
-From my expierence, this cast is closest to C-style casting for non-pointer
+From my experience, this cast is closest to C-style casting for non-pointer
 types as well as between some (but not all) pointer types.  This type of cast,
 like C-style casting, is performed at compile-time.  static_cast can also do
 a downcast of a derived class to a base class, but only if the base class is
@@ -80,7 +80,7 @@ Bad_cast exception.
 
 Note that in Anope we prefer if Anope::debug_cast is used.
 This uses dynamic_cast (and checks for a NULL pointer return) on debug builds
-and static_cast on release builds, to speed up the program beacuse of dynamic_cast's
+and static_cast on release builds, to speed up the program because of dynamic_cast's
 reliance on RTTI.
 
 reinterpret_cast
@@ -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/CMakeLists.txt

@@ -6,10 +6,10 @@ if(WIN32)
   if(IN_SOURCE)
     # Add README.txt to list of files for CPack to ignore
     add_to_cpack_ignored_files("README.txt$" TRUE)
-  endif(IN_SOURCE)
+  endif()
   set(DOCS Changes Changes.conf DEFCON FAQ INSTALL LANGUAGE MODULES NEWS ${CMAKE_CURRENT_BINARY_DIR}/README.txt WIN32.txt)
   install(FILES ${DOCS}
     DESTINATION ${DOC_DIR}
   )
   set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
-endif(WIN32)
+endif()

docs/CODING

@@ -1,4 +1,4 @@
-Orginally pulled from: http://www.inspircd.org/wiki/Coding_Guidelines
+Originally pulled from: https://wiki.inspircd.org/Coding_Guidelines
 
 ---
 
@@ -59,7 +59,7 @@ yet follows these. This will be rectified with time.
 4. Braces
 
    Always put braces opening and closing blocks on separate lines, see the
-   identation example. For example, place braces like this:
+   indentation example. For example, place braces like this:
      if (apples == "green")
      {
          cout << "Apples are green" << endl;

docs/Changes

@@ -1,260 +1,14 @@
-Anope Version 2.0.2
+Anope Version 2.1.0
 -------------------
-Fix keepmodes preventing the first user of a channel from being deopped
-Fix SQlines that don't begin with # from matching channels
-Made cs_clone behave like the help describes, copying many settings and lists by default
-Allow cs_clone to clone levels, too
-Update Hybrid protocol module for 8.2
-Fix not unescaping all characters sent over XMLRPC
-Fix crash when os_mode is used to destroy channels, like when unsetting permanent channel mode from an empty channel
-Allow users with topic change privilege to change the topic instead of requiring them to use ChanServ's topic command
-Fix negatively locking param modes in default mlock
-Change entrymsg to check for the SET privilege, not real founder
-Allow configuring characters allowed in nicknames
-Fix crash when non users register channels externally (like XMLRPC)
-Remove operserv/exception MOVE, it did not function correctly. Instead reorder the list by deleting/adding entries.
-Allow flood ttb to be 0.
-Enforce mlock when disabling defcon modes
-Fix cs_mode not being able to apply mlock on register
-Add log message when users send memos
-Fix old collide timers from staying around after successful identify. Fixes being able to identify and logout and still being hit by the old timers.
-Fix undefined behavior in cs_mode which usually crashes when clearing large list modes
-Show all opertypes in operserv/info, even if no opers use them
-
-Anope Version 2.0.1
--------------------
-Fix access entries on accounts sometimes not updating when a user's display name changes
-Fix ns_group to properly validate the account of the user against the target
-Fix os_stats not saving max user count and time when using SQL
-Fix nickalias's 'nc' field sometimes not being updated when using SQL
-Fix several crashes on Windows related to being unable to load modules
-Fix bs_bot change not properly reintroducing bots after changing their ident, host, or realname
-
-Add English language file to allow users to easily modify language strings
-Add configuring which mode cs_ban sets, and added a MUTE command to BotServ's fantasy
-Allow SVSPART to take an optional reason
-Allow cs_list to search channel topics and descriptions
-
-Anope Version 2.0.0
--------------------
-Added irc2sql stats module
-
-Anope Version 1.9.9
---------------------
-A Added a better webpanel template, removed the old one
-A Added SQL logging support
-A Added Redis database support
-A Added ability to configure what privileges XOP commands give
-U Updated Dutch language file, from Robby <robby@chat.be>
-U Updated Spanish langauge file, from Isaac Fontal <i_fontal@hotmail.com>
-F Fix build on Solaris and OSX
-F Fixed setting BotServ's default settings in the config
-F Fixed some names of config items, including NickServ's kill protect
-
-Anope Version 1.9.8
---------------------
-A Ability to configure fantasy commands in the config
-A Add SVSJOIN and SVSPART commands
-F Fix "leave" channel log level from not logging
-F Fix users able to "resend" their registration mail with registration set to admin only
-F Fix build on OpenBSD
-F Fix not logging debug logs to the logfile when debug mode is enabled
-F Fix defcon timeout timer
-F Fix crash in os_forbid with expiring entries
-F Fix several issues with db_sql_live
-
-Anope Version 1.9.7
---------------------
-A Added ability for using regex as patterns for various commands
-A Extended ability of operserv/akill to also match against nick and realname
-A Added chanserv:require configuration option
-A Added nickserv:unregistered_notice and nickserv:registration configuration option
-A Added options:casemap configuration option
-A Added a web panel
-A db_sql_live now allows all tables to be "live", not just a select few
-
-Anope Version 1.9.6
---------------------
-A Added ability to configure emails sent by services
-A Added chanserv/up and chanserv/down
-A Added m_proxyscan
-A Added more configurability for what vhosts are valid
-A Added chanserv/log
-A Added ability to configure ChanServ privileges
-A Added a new database format
-A Added SQLite support
-A Added more verbose messages on startup
-A Added ability for chanserv/suspend and nickserv/suspend to take an expiry time
-A Added no nickname ownership config option
-A Added m_rewrite
-A Added akill IDs
-F Fixed crash in clearusers
-F Fixed crash in /os oper info
-F Fixed eventfd Config check to work properly on OpenVZ
-
-Anope Version 1.9.5
---------------------
-A Extended LDAP support
-A Added os_oper, os_kill, os_forbid, m_statusupdate, cs_sync, and bs_autoassign
-A Added a new configuration file format
-A Added a new commands system
-A Added a new access system, and cs_flags
-F Fixed not logging debug logs to file
-F Fixed the mail delay time
-F Fixed sending account data for unconfirmed nicks
-F Fixed poll() engine build on FreeBSD
-F Fixed really large HELP replies being truncated
-F Fixed sometimes appending !*@* to valid hosts on access lists
-F Fixed m_ssl sometimes failing connecting for no reason
-F Fixed crash in cs_entrymsg
-F Fixed setting -P on channels with only a botserv bot in it
-F Fixed modemanager complaining about prefixless modes on InspIRCd
-
-Anope Version 1.9.4
---------------------
-A Automatically set channel founder to the user with the highest access if there is no successor
-A /chanserv clone command to copy settings from one channel to another.
-A /chanserv mode command
-A Ability for users to delete their own access in channels
-A Added support for Plexus 3
-A Readded in support for /cs op/deop/etc to op/deop you in all channels
-A Added LDAP support
-A Added live SQL support
-A Added support for learning tracking/storing/locking all modes at runtime
-A Added m_alias
-A Added support for XMLRPC queries
-A Added /botserv set msg
-A Added /operserv config
-A Added /ns cert
-A Added /operserv login
-F Changed the GHOST command to not allow ghosting unidentified users if the RECOVER command exists
-F Some failed logic in /operserv exception that prevents proper exceptions from being added
-F Fixed the anope_os_sxlines MySQL table and code to work after restarting
-
-Anope Version 1.9.3
---------------------
-A Added italics BotServ kicks support
-A Tell users when their nicks expire in /ns glist and /ns info
-A Added SSL support
-A Prevent negaitve mode changes, kicks, bans, and autokicks from affecting people with the 'god' user mode (On UnrealIRCd, usermode +q)
-A Added nickserv/auxpex permission
-A Added nickserv ungroup command
-A Renamed the SGLINE to be SNLINE
-A Added /chanserv saset command
-A Added threads for mail sending
-A Added m_dnsbl and an asynchronous DNS system
-A Added a new language system that uses gettext
-A Added m_mysql which uses threads to execute queries
-A Added many subcommand modules for some commands, eg ns_set_autoop, ns_set_email, etc
-A Added a new logging system that is a bit more flexible
-A Added cs_set_misc and ns_set_misc to add miscellaneous set commands
-A Added os_modreload, which allows reloading some modules not normally unloable, like the protocol module
-A Added FOUNDER access level
-A Made OperServ, Global, MemoServ, and ChanServ optional
-F Shutting down if a config reload fails
-F Autoid to live through restarts on Unreal
-F Storing vhosts in MySQL
-F Not flushing the anope_extra table before rewriting databaes
-F Anoperc start/stop to send the globaloncycle global, and fixed anoperc rehash to really rehash
-F Fixed a potential crash if HostServ or BotServ was disbled
-
-Anope Version 1.9.2
---------------------
-A K alias to chanserv kick command
-A KB alias to chanserv ban command
-A The ability to register empty nonregistered channels
-A Flatfile plaintext databases and removed old binary ones
-A Added in live updating SQL and the ability to execute commands through SQL (see docs/MYSQL)
-A Added support for many more modes into Anope and the ability to have generic support for modes unknown to Anope
-A Added a mode stacker to combine many mode changes into fewer
-A Added in the CS SET PERSIST command which can be used to keep service bots in channels even when the channel is empty
-A Added AUTOOWNER OWNER and OWNERME into CS LEVELS
-A Added ns_resetpass module to the core
-A CS ACCESS VIEW which shows who added the access and last time used
-A Last used time to CS AKICK VIEW
-A Added a sha_256 encryption module
-A Added the ability to load multiple encryption modules, and the ability to seamlessly convert your database between diferent encryptions
-A Added configuration options to allow Anope to reconnect if it disconnects from the uplink instead of dieing
-A Added support for linking with IPv6
-F Unban command to accept an optional nick arg
-F Some typos in services.conf
-F Crash when users change their host that are identified to a group, but not a nick
-F Host length checking in HS SET(ALL) and HS REQUEST
-F Only show if a user is online in NS INFO if they are really identiifed for the group of the nick they are on
-F Crash when using BSSmartJoin
-F Converting access entries to access from xop when a users access is below voice
-F A bad pointer passed to the OnDelEvent which could cause some 3rd party modules to crash
-F CS FORBID allows to you forbid unregistered channels
-F The -nothird command line option to work
-F ms_rsend to really work
-F SQUITing juped servers on InspIRCd1.2+
-
-Anope Version 1.9.1
---------------------
-F Don't enforce akick/forbidden/etc.-restrictions on clients on ulined servers.
-F Remove modules_unload_all fini + hack that goes with it.
-F Signal handling cleanup.
-A Seamless fantasy support on all ChanServ commands, instead of requiring bs_fantasy_*.
-F Allow fantasy to be disabled on some commands (e.g. FORBID).
-F Some commands (e.g. !help) need to strip the pre-provided channelname from them.
-D HelpServ removed
-F Command parser cleanup: mod_current_buffer removed and replaced with proper parser. Commands now indicate how they want the buffer split.
-F Make NS ENFORCE/RELEASE stuff more sane, redo timers.
-A Opertypes (similar to InspIRCd's opertypes)
-
-Provided by Ankit <ankit@nevitus.com> - 2009
-F Segfault on shutdown
-
-Provided by Adam <adam@anope.org> - 2009
-F NickServ registration is sometimes denied.
-F Applied patch from Adam to fix some potential screwups
-F More fixes to bs_bot from Adam, plus an extra fix within DoAdd not covered in Adam's patch.
-F Fix bs_bot to use the correct parameters, patch from Adam.
-F Fix for bug #1004, based from second half of patch from Adam.
-F Partial patch by Adam, commenting fix for #1006 for future reference.
-F Forward-port r1946:  Patch by Adam fixing #1006 (originally caused by #922): modes set by ChanServ are reversed. Thanks!
-
-Provided by DukePyrolator <dukepyrolator@gmx.de> - 2009
-F Patch converting all match calls to new method, thanks!
-F Add 'w' and 'y' support to dotime(), also prevent an overflow.
-F Allow NS STATUS from unregistered users, thanks DP!
-F Wild pointers do not a happy Anope make. Thanks DP :)
-F Allow NS REGISTER to unregistered nicks, silly oversight. Thanks DP! :)
-F Fix call order, thanks to DP
-F Pass the right array to do_umode(), fixes mode tracking on Unreal. Thanks to DukePyrolator (yet again :P)
-F Fix bs_set help, thanks to DukePyrolator! :)
-F Fix two segfaults, noted by DukePyrolator. Thanks!
-F Fix part one of #1010, reported by DukePyrolator. (Language settings are not respected in message sending.) Thanks!
-F Memory leak on +beI modes.
-
-Provided by Liber <Liber@jasonirc.net> - 2009
-F Support operoverride and such things (stop reversing changes from nonopped people where unnecessary)
-
-Anope Version 1.9.0
---------------------
-F Modified compile to use g++
-F Improve protocol modules support (classes, virtual methods, etc)
-F Move core services to use BotInfo
-F Move BotInfo and related methods into a class
-F Move modules into a class
-F Fixed ns resending of passcode issue
-F Modules now delete themselves
-F additional field where users' masked host can be stored so both masked IP and vhost are available instead of just one.
-F No struct Uid, ugly, and, unnecessary that we store UID in BotInfo.
-F Prevent deletion of core services via /bs bot
-F Module subsystem cleanup ('modules' branch)
-F Move modules to use classes somewhat (AnopeInit, AnopeFini)
-F Change MODULE_INIT to return a pointer
-F Remove duplicate module creation.. have loadModule return a pointer rather than creating one
-F Remove buffered loading/unloading, this makes os_modunload perm, but who cares
-F Remove 'delayed' loading, this is necessary because of before/after connected to ircd (ircd is before, rest after), I'm sure this can be done better.
-A Remove old config, replace with insp-inspired (albeit bind format) config (CBX)
-F Clean up protocol modules a bit
-A InspIRCd 1.2 support
-F Remove old (prior to 1.8.0) db compat
-F Establish a proper base for services pseudoclients
-F Add ss_main StatServ Hal9000 to play with :)
-F Burn automake with fire (CBX)
-
-Provided by mooncup <mooncup@anonnet.org> - 2009
-F Automatically reapply vhost on hs off for unreal.
+Added support for access list entry descriptions.
+Added support for linking over a UNIX socket.
+Added support for server-initiated logins and logouts on UnrealIRCd.
+Added support for server-initiated logouts on InspIRCd.
+Added support for the ANONYMOUS SASL mechanism.
+Allowed users to opt-out of being added to channel access lists.
+Cleaned up the codebase to use Modern C++17.
+Modernized the build system to use a modern version of CMake.
+Removed support for using insecure encryption methods as the primary method.
+Removed the Windows-only anopesmtp tool.
+Removed the two day X-line cap.
+Updated all references to IRCServices to refer to Anope instead.

docs/Changes.conf

@@ -1,172 +1,13 @@
-Anope Version 2.0.2
+Anope Version 2.1.0
 -------------------
-Add an operserv/oper/modify privilege, required to use oper add and oper del
-Add a chanserv/access/list privilege, which allow readonly access to ChanServ access and akick lists
-Changed m_dnsbl's result configuration to be more extensible
-Add 'max' setting to cs_mode
-Add 'nickchars' setting to networkinfo
-Add 'botserv/fantasy', 'chanserv/access/list', and 'operserv/oper/modify' oper privileges
-Fix 'emailchange_message' to include the proper email address
-Set a default permission on operserv/defcon
-
-Anope Version 2.0.1
--------------------
-Add MUTE command to BotServ fantasy configuration
-Document memo_mail option in nickserv.conf
-Add 'show' setting to ns_info and cs_info to control which fields are shown to non opers
-
-Anope Version 2.0.0
--------------------
-options:passlen, enforceruser, enforcerhost, releasetimeout, and guestnickprefix moved to nickserv's module configuration
-options:hideregisteredcommands added
-m_ssl renamed to m_ssl_openssl
-mail:restrict removed
-
-Anope Version 1.9.9
--------------------
-There is not many config changes betewen 1.9.8 and 1.9.9, however many of the
-options have been moved around to make more sense, too many to list here,
-so get a new config.
-
-Anope Version 1.9.8
--------------------
-networkinfo:chanlen added
-options:user and options:group added
-nickserv:modesonid added to set modes on everyone who identifies
-nickserv:kill and nickserv:killquick added to configure NickServ's kill timeout
-nickserv:restoreonrecover added to try to restore a user's session after a ghost
-command:group added
-fantasy block added
-dns block has been moved to modules.conf as a part of m_dns
-
-Anope Version 1.9.7
--------------------
-operserv:notifications removed in favor of log{} blocks
-options:regexengine added
-options:casemap added
-chanserv:require added
-nickserv:registration added, emailregistration removed.
-nickserv:unregistered_notice added
-
-Anope Version 1.9.6
--------------------
-service:channels added to join services to channels
-mail block modified to allow configuring of email messages
-oper:host and oper:vhost added
-oper:require_oper added
-options:nonicknameownership added
-operserv:akillids added
-nickserv/access oper privilege added
-
-Anope Version 1.9.5
--------------------
-Don't even try it, get a new config and start over.
-
-Anope Version 1.9.4
--------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-memoserv:modules added ms_ignore
-chanserv:modules added cs_clone and cs_mode
-nickserv:suspendexpire and nickserv:forbidexpire added
-chanserv:suspendexpire and chanserv:forbidexpire added
-module added cs_entrymsg
-nickserv:modules added ns_ajoin, ns_cert
-options:nomlock added
-log:target added globops
-nickserv:confirmemailchanges added
-operserv:modules added os_config, os_login
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-operserv:notifications removed osglobal, osmode, oskick, osakill, ossnline, ossqline, osszline, osnoop, osjupe, getpass, setpass, forbid, drop
-renamed nickserv:preregexpire to nickserv:unconfirmedexpire
-
-** DELETED  CONFIGURATION DIRECTIVES **
-opertype:commands removed operserv/umode
-operserv:modules removed os_umode
-
-Anope Version 1.9.3
-------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-nickserv/auspex privilege added
-SSL module added for SSL support
-opertype:inherits added to allow opertypes to inherit commands and privs from other opertypes
-Various nickserv/saset/* and chanserv/saset/* opertype command privileges added
-nickserv:modules added many new ns_set_command modules
-chanserv:modules added many new cs_set_command modules
-opertype:commands added nickserv/saset/* and chanserv/saset/*
-options:socketengine added to choose what socket engine to use
-module:cs_set_misc and module:ns_set_misc added to replace the old set url/icq/email modules
-options:hideprivilegedcommands added to hide privileged commands from normal users
-log block added to customize logging
-dns block added to configure dns settings
-m_dnsbl added
-mysql configuration block added
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-opertype:commands changed operserv/sgline to opserv/snline
-operserv:modules changed os_sgline to os_snline
-operserv:modules added os_modreload
-operserv:sglineexpiry changed to operserv:snlineexpiry
-operserv:killonsgline changed to operserv:killonsnline
-operserv:notifications ossgline changed ossnline
-memoserv was made optional
-moved operserv:global configuration into its own global block
-chanserv was made optional
-
-** DELETED  CONFIGURATION DIRECTIVES **
-serverinfo:helpchannel removed because it has been readded in m_helpchan
-networkinfo:logchannel, logbot, logusers, logmaxusers, logchannel, and options:keeplogs removed because of the log block
-dumpcore because it really didn't do anything
-
-Anope Version 1.9.2
---------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-options:enablelogchannel added to auto turn on the logchannel on startup
-options:mlock added to configure the default mlock modes on new channels
-options:database added for the database modules
-options:botmodes added to configure modes BotServ bots should use
-options:userlen added to configure maxiumum ident length
-options:hostlen added to configure maximum hostname length
-options:database added to configure what database modules to use
-options:passlen added to specify the maximum length of passwords
-uplink:ipv6 added to enable IPv6 connectivity
-options:maxretries added to specify the number of reconnect attempts allowed
-options:retrywait added to specify how long to wait between reconnect attempts
-opertype command chanserv/aop/list removed as it was unnecessary, use chanserv/access/list instead
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-options:encryption added enc_sha256
-chanserv:modules added cs_unban
-nickserv:modules added ns_resetpass
-
-** DELETED  CONFIGURATION DIRECTIVES **
-nickserv:database deleted because of new database system
-nickserv:prenickdatabase deleted because of new database system
-chanserv:database deleted because of the new database system
-botserv:database deleted because of the new database system
-hostserv:database deleted because of the new database system
-operserv:database deleted because of the new database system
-operserv:newsdatabase deleted because of the new database system
-operserv:exceptiondatabase deleted because of the new database system
-hs_request:database deleted because of the new database system
-os_ignore:database deleted because of the new database system
-serverinfo:localport deleted
-
-Anope Version 1.9.1
--------------------
-** ADDED    CONFIGURATION DIRECTIVES **
-Opertypes have been added, through the opertype blocks.
-Services Operators are now specified in the oper blocks.
-
-** MODIFIED CONFIGURATION DIRECTIVES **
-botserv:modules no longer contains bs_fantasy* modules, fantasy is now seamless.
-operserv:modules has replaced os_logonnews, os_opernews, and os_randomnews with os_news.
-operserv:modules no longer contains os_admin and os_oper modules, removed in favor of oper blocks.
-operserv:notifications no longer contains osraw due to removal of OS RAW.
-
-** DELETED  CONFIGURATION DIRECTIVES **
-Nick tracking has been removed as an option.
-Restricting of NS GETPASS and CS GETPASS removed in favor of opertypes.
-Host Setters were removed in favor of opertypes.
-HelpServ has been removed entirely.
-operserv:disableraw removed due to removal of OS RAW.
+Added nickserv:minpasslen for configuring the minimum password length.
+Removed nickserv:strictpasswords as it is obsolete now nickserv:minpasslen exists.
+Removed the inspircd12 and inspircd20 modules (use inspircd instead).
+Removed the ns_getpass module (no supported encryption modules).
+Removed the os_oline module (no supported IRCds).
+Removed the unreal module (use unrealircd instead)
+Renamed nickserv:passlen to nickserv:maxpasslen.
+Renamed the charybdis module to solanum.
+Renamed the inspircd3 module to inspircd.
+Renamed the unreal4 module to unrealircd.
+Replaced uplink:ipv6 with uplink:protocol.

docs/DEFCON

@@ -1,4 +1,4 @@
-Anope DefCon 
+Anope DefCon
 ------------
 
 1) Introduction
@@ -11,7 +11,7 @@ Anope DefCon
 1) Introduction
 
     Anope 1.6 onwards supports a unique protection mechanism based on the
-    military "Defense Readiness Condition" (DefCon) system. It is based on 
+    military "Defense Readiness Condition" (DefCon) system. It is based on
     5 levels of defense readiness defined as:
 
     DEFCON5 Normal peacetime readiness
@@ -23,9 +23,9 @@ Anope DefCon
     These are configurable levels that mandates what actions Anope should
     take in case of emergency and change in readiness status.
 
-    It is used to prevent abuse to both Services, and the ircd on which they 
+    It is used to prevent abuse to both Anope, and the IRCd on which they
     are running. Also to protect the users, primarily in the event of Clones
-    and/or FloodBOT attacks. 
+    and/or FloodBOT attacks.
 
 2) Installation
 
@@ -44,26 +44,26 @@ Anope DefCon
 
     Pre-defined DefCon actions:
 
-    No new channel registrations 
-    No New Nick Registrations 
+    No new channel registrations
+    No New Nick Registrations
     No Mode Lock changes
-    Force Chan Mode 
-    Use Reduced Session Limit 
-    KILL any new clients trying to connect 
-    Services will ignore everyone but opers 
-    Services will silently ignore everyone but opers 
-    AKILL all new clients trying to connect 
+    Force Chan Mode
+    Use Reduced Session Limit
+    KILL any new clients trying to connect
+    Ignore everyone but opers
+    Silently ignore everyone but opers
+    AKILL all new clients trying to connect
     No new memos sent to block MemoServ attacks
-    
+
     Information regarding how to enable this for specific defcon levels can
     be found in operserv.conf
 
 4) Usage
 
-    Anope starts up in DEFCON5 (normal readiness). To change the Defcon level 
-    in action use: 
-    
-    /msg OperServ DEFCON 1|2|3|4|5 
+    Anope starts up in DEFCON5 (normal readiness). To change the Defcon level
+    in action use:
+
+    /msg OperServ DEFCON 1|2|3|4|5
 
 5) Usage Example
 
@@ -89,6 +89,5 @@ Anope DefCon
 
 6) Support
 
-    You might get DefCon support by posting on our online forum, or maybe on 
+    You might get DefCon support by posting on our online forum, or maybe on
     our #anope channel at /server irc.anope.org.
-

docs/EVENTS

@@ -22,14 +22,10 @@ Anope Internal Events
     The full list of functions and parameters are in modules.h. In this
     case, you would be overriding OnJoinChannel() and OnPartChannel() like so:
 
-    void OnJoinChannel(User *u, Channel *c) anope_override { }
-    void OnPartChannel(User *u, Channel *c) anope_override { }
+    void OnJoinChannel(User *u, Channel *c) override { }
+    void OnPartChannel(User *u, Channel *c) override { }
 
     Some of these event overrides can be used to prevent or allow things to
     happen that would normally not be allowed or denied. You can also use
     ModuleManager (not explained here) to set control which order the modules
     are queried (when multiple modules hook to the same event).
-
-    The "anope_override" identifier is for compatibility with C++11.
-    Its usage is highly recommended.
-

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.
@@ -52,15 +52,15 @@ Note: You should also read the README and FAQ files!
     cause trouble on your network if passwords are not encrypted, or read
     the memos of any user.
 
-    Now go into the conf directory (by default, ~/services/conf). Copy the example
-    configuration file (example.conf) to services.conf, and open the latter
+    Now go into the conf directory (by default, ~/anope/conf). Copy the example
+    configuration file (anope.example.conf) to anope.conf, and open the latter
     with your favorite text editor. It contains all the configuration
     directives Anope will use at startup. Read the instructions contained in
     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
-    irc.anope.org. Provide *complete* error output, along with other relevant 
+    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.
 
@@ -71,40 +71,36 @@ Note: You should also read the README and FAQ files!
 
         * IMPORTANT: Back up your old databases!
         * If you are upgrading to a new major release, ALWAYS restart a
-          fresh configuration file from example.conf.
+          fresh configuration file from anope.example.conf.
 
 3) Setting up the IRCd
 
-    Services acts as an IRC server with pseudo-clients on it. To link them to
+    Anope acts as an IRC server with pseudo-clients on it. To link them to
     your network, you'll need to configure your IRCd to allow services to link.
 
     The configuration varies depending on the IRCd, but you will probably need
     a link block (also called connect block, or C line), a U line (also called
-    a shared block), and be sure that the IRCd is listneing on the given port
+    a shared block), and be sure that the IRCd is listening on the given port
     in the link block.
 
-    Example link configurations can be found in example.conf for some of the
+    Example link configurations can be found in anope.example.conf for some of the
     popular IRCds.
 
     Don't forget to /rehash your IRCd to apply changes.
 
-    You may also try our interactive link maker, which is located at:
-
-        http://anope.org/ilm.php
-
 4) Starting Anope
 
     Go into the directory where binaries were installed (by default, this is
-    ~/services/bin). Type ./services to launch Anope.
+    ~/anope/bin). Type ./anope to launch Anope.
 
     If there are syntax errors in the configuration file they will be
     displayed on the screen. Correct them until there are no errors anymore.
     A successful startup won't generate any message.
 
-    Give Services at least one minute to link to your network, as certain
+    Give Anope at least one minute to link to your network, as certain
     IRCds on some OSes may be really slow for the link process. If nothing
     happens after about a minute, it is probably a configuration problem. Try
-    to launch Anope with ./services -debug -nofork to see any errors that it
+    to launch Anope with ./anope -debug -nofork to see any errors that it
     encounters, and try to correct them.
 
     If you need help to solve errors, feel free to subscribe to the Anope
@@ -116,16 +112,16 @@ Note: You should also read the README and FAQ files!
     still running, and restart it if not.
 
     First rename the example.chk script that is in Anope path (by default,
-    this is ~/services/conf) to services.chk and edit it. You'll need to 
-    modify the CONFIGURATION part of the file. Then ensure that the file is 
-    marked as executable by typing chmod +x services.chk, and try to launch the
+    this is ~/anope/conf) to anope.chk and edit it. You'll need to
+    modify the CONFIGURATION part of the file. Then ensure that the file is
+    marked as executable by typing chmod +x anope.chk, and try to launch the
     script to see if it works (Anope must not be running when you do this ;))
 
     When this is done, you'll have to add the crontab entry. Type crontab -e.
     This will open the default text editor with the crontab file. Enter the
     following (with correct path):
 
-        */5 * * * * /home/ircd/services/conf/services.chk >/dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/anope.chk >/dev/null 2>&1
 
     The */5 at the beginning means "check every 5 minutes". You may replace
     the 5 with other another number if you want (but less than 60). Consult

docs/INSTALL.fr

@@ -12,14 +12,14 @@ Note : Vous devrez également lire les fichiers README et FAQ !
 1) Installation d'Anope
 
     NOTE IMPORTANTE : il est déconseillé d'utiliser (et même d'installer)
-                      Anope en tant que root. Utilisez un utilisateur non 
+                      Anope en tant que root. Utilisez un utilisateur non
                       privilégié. Celui que vous utilisez pour l'IRCd ou
 		              un utilisateur dédié suffira.
 
     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 :
@@ -27,12 +27,12 @@ Note : Vous devrez également lire les fichiers README et FAQ !
         cmake --version
 
     Si CMake est installé, vous aurez une ligne qui dit quelque chose comme
-    "cmake version 2.8.12.2". Si la version est inférieure à 2.4 ou si vous 
+    "cmake version 2.8.12.2". Si la version est inférieure à 2.4 ou si vous
     obtenez une erreur disant que la commande n'a pas été trouvée, vous ne
     pourrez pas utiliser CMake à moins de l'installer vous-même dans votre
-    répertoire home. CMake peut être téléchargé ici : 
+    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éé.
@@ -49,22 +49,22 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     Allez dans le dossier build (cd build) et tapez make et make install.
     Ceci va installer tous les fichiers nécessaires dans les dossiers que
     vous avez indiqués avec le script Config et régler les permissions des
-    fichiers. Vous devez vous assurer que le répertoire data n'est pas 
-    accessible par les autres utilisateurs, car des utilisateurs 
+    fichiers. Vous devez vous assurer que le répertoire data n'est pas
+    accessible par les autres utilisateurs, car des utilisateurs
     malveillants pourraient causer des problèmes sur votre réseau, si les
     mots de passe ne sont pas chiffrés, ou lire les mémos de tous les
     utilisateurs.
 
-    Allez maintenant dans le répertoire conf (par défaut, ~/services/conf).
-    Copiez l'exemple de fichier de configuration (example.conf) en
-    services.conf et ouvrez ce dernier avec votre éditeur de texte favori.
+    Allez maintenant dans le répertoire conf (par défaut, ~/anope/conf).
+    Copiez l'exemple de fichier de configuration (anope.example.conf) en
+    anope.conf et ouvrez ce dernier avec votre éditeur de texte favori.
     Il contient toutes les directives de configuration qu'Anope va utiliser
     en démarrant. Lisez attentivement les instructions contenues dans le
     fichier. L'utilisation des valeurs par défaut n'est pas toujours
     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
@@ -78,11 +78,11 @@ Note : Vous devrez également lire les fichiers README et FAQ !
         * IMPORTANT : Sauvegardez vos anciennes bases de données !
         * Si vous mettez à jour vers une nouvelle version majeure,
           recommencez *toujours* toute votre configuration à partir du
-          fichier example.conf.
+          fichier anope.example.conf.
 
 3) Configuration de l'IRCd
 
-    Les Services agissent comme un serveur IRC avec des pseudo-clients. 
+    Anope agit comme un serveur IRC avec des pseudo-clients.
     Pour les relier à votre réseau, vous aurez besoin de configurer votre
     IRCd pour permettre aux services de se connecter.
 
@@ -92,21 +92,16 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     sur le port donné dans le bloc link.
 
     Des exemples de configurations de bloc link peuvent être trouvés dans
-    le fichier example.conf pour certains des IRCd les plus populaires.
+    le fichier anope.example.conf pour certains des IRCd les plus populaires.
 
     Souvenez-vous de /rehash votre IRCd pour appliquer les changements.
 
-    Vous pouvez également essayer notre créateur de bloc link interactif
-    situé ici :
-
-        http://anope.org/ilm.php
-
 4) Mettre en route Anope
 
     Allez dans le répertoire où les fichiers binaires ont été installés
-    (par défaut, ~/services/bin). Tapez ./services pour lancer Anope.
+    (par défaut, ~/anope/bin). Tapez ./anope pour lancer Anope.
 
-    S'il y a des erreurs de syntaxe dans le fichier de configuration, elles 
+    S'il y a des erreurs de syntaxe dans le fichier de configuration, elles
     seront affichées à l'écran. Corrigez-les jusqu'à ce qu'il n'y en ait
     plus. Un démarrage réussi ne générera pas de message.
 
@@ -114,7 +109,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     réseau, car certains IRCds sur certains systèmes peuvent être très
     lents pour le processus de liaison. Si rien ne se passe après environ
     une minute, il y a probablement un problème de configuration. Essayez
-    de lancer Anope en mode debug avec ./services -debug -nofork pour voir
+    de lancer Anope en mode debug avec ./anope -debug -nofork pour voir
     toutes les erreurs rencontrées et essayez de les corriger.
 
     Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à
@@ -127,10 +122,10 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     est toujours en cours d'exécution et de le redémarrer s'il n'est pas.
 
     D'abord renommez le script example.chk qui est dans les dossiers
-    d'Anope (par défaut, ~/services/conf) en services.chk et modifiez-le.
+    d'Anope (par défaut, ~/anope/conf) en anope.chk et modifiez-le.
     Vous aurez besoin de modifier la partie CONFIGURATION du fichier.
     Assurez-vous ensuite que le fichier est marqué comme exécutable en
-    tapant chmod +x services.chk et essayez de lancer le script pour voir
+    tapant chmod +x anope.chk et essayez de lancer le script pour voir
     si cela fonctionne (Anope ne doit pas être en marche lorsque vous
     testez cela ;))
 
@@ -138,7 +133,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     crontab -e. Cela va ouvrir l'éditeur de texte par défaut avec le
     fichier crontab. Entrez la ligne suivante (avec le chemin correct) :
 
-        */5 * * * * /home/ircd/services/conf/services.chk > /dev/null 2>&1
+        */5 * * * * /home/ircd/anope/conf/anope.chk > /dev/null 2>&1
 
     Le */5 au début signifie "vérifier toutes les 5 minutes". Vous pouvez
     remplacer le 5 par un autre numéro si vous voulez (mais moins de 60).

docs/LANGUAGE

@@ -1,9 +1,10 @@
-Anope Mutli Language Support
+Anope Multi Language Support
 ----------------------------
 
 1) Building Anope with gettext support
 2) Adding a new language
 3) Using languages with modules
+4) Updating a language file
 
 1) Building Anope with gettext support
 
@@ -22,13 +23,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.
+    translating. Once you are done simply rerun ./Config; make && make install and add the language to your anope.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
@@ -36,7 +37,7 @@ Anope Mutli Language Support
 
     NOTE: There is no guarantee we will use your work so please do not be offended if we say no thanks.
 
-3) Using langages with modules
+3) Using languages with modules
 
     Module authors can easily add the ability to have their modules translated by adding _() around the strings they
     want translated (messages to the user, etc).
@@ -51,3 +52,14 @@ Anope Mutli Language Support
 
     All .po and .pot files should be placed in modules/third/language. Additionally an update script is provided there
     that will create .pot files and merge any changes to it with existing .po files.
+
+4) Updating a language file
+
+    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).
+
+    Before editing the relevant file in languages/, run `update.sh` in the languages/ folder, i.e. `cd` to it and run
+        ./update.sh
+    This will update the language file to contain all strings that need a translation.
+
+    Then commit only the changed .po files in git.

docs/MODULES

@@ -22,7 +22,7 @@ Anope Modules
     1. If modules are supported by your system, they will be configured
        automatically when you run ./Config. The modules will be installed
        to the modules directory in your data path (by default this will
-       be ~/services/data/modules).
+       be ~/anope/data/modules).
 
     2. Compile Anope as usual using ./Config. The "make" process will now
        compile module support into Anope, and compile the default sample
@@ -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.
@@ -98,7 +98,7 @@ Anope Modules
     1. Make sure you're in the main source directory. (usually anope-1.X.XX/)
     2. Run ./Config to find and configure modules, then `cd build`.
     3. Run `make` to compile Anope, and any modules.
-    4. Run `make install` to copy the compiled binaries to the ~/services/
+    4. Run `make install` to copy the compiled binaries to the ~/anope/
        directory.
 
     You can now use /msg OperServ MODLOAD to load the new modules.
@@ -117,12 +117,12 @@ 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/NEWS

@@ -4,4 +4,3 @@ Highlighted News in Anope 1.9
 * Added in live updating SQL and the ability to execute commands through SQL
 * Re-designed configuration file
 * Code refresh / rewrite into C++
-

docs/README

@@ -1,16 +1,14 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2014 Anope Team    <team@anope.org>.
+Anope is          2003-2023 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 Epona may be found at http://www.epona.org/
-Information about Services may be found at http://www.ircservices.esper.net/
+Information about Anope may be found at https://www.anope.org/
 
 Table of Contents
 -----------------
@@ -19,7 +17,7 @@ Table of Contents
 3) Installation
 4) Command Line Options
 5) Messages Translation
-6) Contact and Mailing List
+6) Contact
 
 1) Credits
 
@@ -94,7 +92,7 @@ Table of Contents
         * Lee Holmes <lethality@anope.org>
         * Lucas Nussbaum <lucas@lucas-nussbaum.net>
         * Mark Summers <mark@goopler.net>
-        * Matthew Beeching <jobe@invictachat.net>
+        * Matthew Beeching <jobe@mdbnet.co.uk>
         * Naram Qashat <cyberbotx@anope.org>
         * Phil Lavin <phil@anope.org>
         * Pieter Bootsma <geniusdex@anope.org>
@@ -107,11 +105,11 @@ Table of Contents
 
     Anope Translations:
 
-        * Robby <robby@chat.be> (nl_NL)
+        * Robby <robby@chatbelgie.be> (nl_NL)
         * Kein <kein-of@yandex.ru> (ru_RU)
         * Maik Funke <Han@mefalcon.org> (de_DE)
         * Isaac Fontal <i_fontal@hotmail.com> (es_ES)
-        * Janos Kapitany <sarkanyka@cjbchat.hu>  (hu_HU)
+        * Janos Kapitany <sarkanyka@cjbchat.hu> (hu_HU)
         * Szymon S'wierkosz <szymek@adres.pl> (pl_PL)
         * Christopher N. <saka@epiknet.org> (fr_FR)
         * Yusuf Kurekci <ysfm.20@gmail.com> (tr_TR)
@@ -122,7 +120,7 @@ Table of Contents
 
 2) Presentation
 
-    Anope is a set of Services for IRC networks that allows users to manage
+    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.
 
@@ -169,13 +167,13 @@ Table of Contents
     Anope currently works with:
 
         * Bahamut 1.4.27 or later (including 1.8)
-        * Charybdis 3.4 or later
-        * Hybrid 8.1 or later
-        * InspIRCd 1.2 or 2.0
+        * ircd-hybrid 8.2.23 or later
+        * InspIRCd 3 or later
         * ngIRCd 19.2 or later
         * Plexus 3 or later
         * Ratbox 2.0.6 or later
-        * UnrealIRCd 3.2 or later
+        * Solanum (all versions)
+        * UnrealIRCd 4 or later
 
     Anope could also work with some of the daemons derived by the ones listed
     above, but there's no support for them if they work or don't work.
@@ -227,7 +225,7 @@ Table of Contents
     the log file; if you send a bug report, PLEASE include an excerpt from
     the log file WITH DEBUGGING ACTIVE; we cannot emphasize enough how
     important this is to tracking down problems. (You can also enable
-    debugging while Services is running using OperServ's SET DEBUG command.)
+    debugging while Anope is running using OperServ's SET DEBUG command.)
     If you repeat use --debug=<level>, the debugging level will be increased,
     which provides more detailed information but may also slow Anope down
     considerably and make the log file grow dramatically faster. In general,
@@ -242,19 +240,19 @@ 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
     your question, feel free to post on the website forums or join our irc
-    channel (irc.anope.org #anope). Once you join our Support channel be as 
+    channel (irc.anope.org #anope). Once you join our Support channel be as
     precise as possible when asking a question, because we have no extraordinary
-    powers and can't guess things if they aren't provided. 
+    powers and can't guess things if they aren't provided.
 
     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
-    whether the bug happens always or under what circumstances, and anything
+    (https://github.com/anope/anope/issues) 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
@@ -14,7 +14,7 @@ Table of Contents
 1) Data structure
 
     There are 4 key namespaces in Anope, they are:
-    
+
         id -    The keys in id are used to atomically create object ids for new
                 objects. For example, if I were to create a new BotInfo I would first:
 
@@ -32,7 +32,7 @@ Table of Contents
 
         hash -  The keys in hash are the actual objects, stored as hashes. For
                 example, if I had just looked up all BotInfo ids and wanted to iterate
-                over all of them, I woulld start by:
+                over all of them, I would start by:
 
                 redis 127.0.0.1:6379> HGETALL hash:BotInfo:1
 
@@ -70,10 +70,10 @@ 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.
+    and will not regularly read from the database once started.
 
     You can use this to modify objects in Redis and have them immediately reflected
     back into Anope. Additionally you can use this feature to run multiple Anope
@@ -93,7 +93,7 @@ Table of Contents
 
     The key space ids and value are managed entirely by Anope, you do
     not (and should not) modify them. Once you modify the object (hash), Anope will
-    update them for you to correctly refelect any changes made to the object.
+    update them for you to correctly reflect any changes made to the object.
 
     Finally, always use atomic operations. If you are inserting a new object with
     multiple commands, or inserting multiple objects at once, specifically if the
@@ -149,12 +149,12 @@ Table of Contents
         Which returns a new object ID for me, in this example it will be "8".
         Now I can create the object:
 
-        HMSET hash:BotInfo:8 nick redis user redis host services.anope.org realname "Services for IRC Networks"
+        HMSET hash:BotInfo:8 nick redis user redis host services.anope.org realname "Anope IRC Services"
 
         Note if you are using HSET instead of HMSET you will need to use a transaction, as shown in the above example.
-        If you are watching your services logs you will immediatly see:
+        If you are watching your services logs you will immediately see:
 
-        USERS: redis!redis@services.anope.org (Services for IRC Networks) connected to the network (services.anope.org)
+        USERS: redis!redis@services.anope.org (Anope IRC Services) connected to the network (services.anope.org)
 
         And the bot redis will be in BotServ's bot list.
         Notice how ids:BotInfo and the value keys are updated automatically.

docs/TOOLS

@@ -1,26 +0,0 @@
-Anope Bundled Tools
--------------------
-
-1) Anope SMTP Client
-
-    Provided with Anope is a simple SMTP client which can be used instead of
-    programs like SendMail in some cases.
-
-    The SMTP client can be used instead of sendmail for use with Anope's mail
-    options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines sendmailpath. On
-    that line, change the path to your services installation directory, then
-    followed by "bin/anopesmtp" and the IP address of a valid SMTP server. It
-    should look like this:
-
-        sendmailpath = "/home/anope/services/bin/anopesmtp 127.0.0.1"
-
-    If the SMTP client doesn't send mail, or if there's an other problem with
-    it, you can enable debug mode by passing the --debug flag after the server
-    address. This should generate a log file of what happened when it tried
-    to connect to the SMTP server.
-
-        Credits:
-    Originally written by  Dominick Meglio    <codemastr@unrealircd.com>
-    Ported to *nix by      Trystan Scott Lee  <trystan@nomadirc.net>
-

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.)
 
@@ -103,7 +103,7 @@ Anope for Windows
        INSTALL within the Solution Explorer. Right-click on INSTALL and choose Build.
 
        When you have done this, all the files will be installed to where they belong.
-       The only thing you need to do is rename "data/example.conf" to be "data/services.conf",
+       The only thing you need to do is rename "data/anope.example.conf" to be "data/anope.conf",
        and then follow the steps to set up Anope.
 
     You have now completed the building phase of Anope for Windows. You can
@@ -120,7 +120,7 @@ Anope for Windows
     Notepad will cause strange characters to appear, and you may not be able to
     edit the file correctly.
 
-    Open services.conf, and read through it carefully and adjust the settings
+    Open anope.conf, and read through it carefully and adjust the settings
     you think you need to adjust.
 
     If you are unsure of the settings, you can go to the dos command prompt
@@ -159,4 +159,3 @@ Anope for Windows
     Anope's Windows Installer was made using:
 
         * NSIS 2.20          <http://nsis.sourceforge.net>
-

docs/XMLRPC/XMLRPC

@@ -7,7 +7,7 @@ checkAuthentication - Takes two parameters, an account name and a password. Chec
                       is correct for the account name, useful for making login pages on websites.
 
 command - Takes three parameters, a service name (BotServ, ChanServ, NickServ), a user name (whether online or not), and the command
-          to execute. This will execute a the given command to Anope using the given service name. If the user given is online, the
+          to execute. This will execute the given command to Anope using the given service name. If the user given is online, the
 	  command reply will go to them, if not it is returned by XMLRPC.
 
 stats - Takes no parameters, returns miscellaneous stats that can be found in the /operserv stats command.
@@ -17,10 +17,13 @@ channel - Takes one parameter, a channel name, and returns real time information
 
 user - Takes one parameter, a user name, and returns real time information regarding that user.
 
+opers - Takes no parameters, returns opertypes, their privileges and commands.
+
+notice - Takes three parameters, source user, target user, and message. Sends a message to the user.
+
 XMLRPC was designed to be used with db_sql, and will not return any information that can be pulled from the SQL
 database, such as accounts and registered channel information. It is instead used for pulling realtime data such
 as users and channels currently online. For examples on how to use these calls in PHP, see xmlrpc.php in docs/XMLRPC.
-          
+
 Also note that the parameter named "id" is reserved for query ID. If you pass a query to Anope containing a value for id. it will
 be stored by Anope and the same id will be passed back in the result.
-

docs/XMLRPC/xmlrpc.php

@@ -1,90 +1,145 @@
 <?php
-/* XMLRPC Functions
+
+/**
+ * XMLRPC Functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
- *
  */
 
 class AnopeXMLRPC
 {
-	private $Host;
+    /**
+     * The XMLRPC host
+     *
+     * @var string
+     */
+    private $host;
 
-	function __construct($Host)
-	{
-		$this->Host = $Host;
-	}
+    /**
+     * Initiate a new AnopeXMLRPC instance
+     *
+     * @param $host
+     */
+    public function __construct($host)
+    {
+        $this->host = $host;
+    }
 
-	/** Run an XMLRPC command. Name should be a query name and params an array of parameters, eg:
-	 * $this->RunXMLRPC("checkAuthentication", array("adam", "qwerty"));
-	 * If successful returns back an array of useful information.
-	 *
-	 * Note that $params["id"] is reserved for query ID, you may set it to something if you wish.
-	 * If you do, the same ID will be passed back with the reply from Anope.
-	 */
-	function RunXMLRPC($name, $params)
-	{
-		$xmlquery = xmlrpc_encode_request($name, $params);
-		$context = stream_context_create(array("http" => array(
-			"method" => "POST",
-			"header" => "Content-Type: text/xml",
-			"content" => $xmlquery)));
+    /**
+     * Run an XMLRPC command. Name should be a query name and params an array of parameters, eg:
+     * $this->raw("checkAuthentication", ["adam", "qwerty"]);
+     * If successful returns back an array of useful information.
+     *
+     * Note that $params["id"] is reserved for query ID, you may set it to something if you wish.
+     * If you do, the same ID will be passed back with the reply from Anope.
+     *
+     * @param $name
+     * @param $params
+     * @return array|null
+     */
+    public function run($name, $params)
+    {
+        $xmlquery = xmlrpc_encode_request($name, $params);
+        $context = stream_context_create(["http" => [
+            "method" => "POST",
+            "header" => "Content-Type: text/xml",
+            "content" => $xmlquery]]);
 
-		$inbuf = file_get_contents($this->Host, false, $context);
-		$response = xmlrpc_decode($inbuf);
+        $inbuf = file_get_contents($this->host, false, $context);
+        $response = xmlrpc_decode($inbuf);
 
-		if (isset($response[0]))
-			return $response[0];
-		return NULL;
-	}
+        if ($response) {
+            return $response;
+        }
 
-	/** Do Command on Service as User, eg:
-	 * $anope->DoCommand("ChanServ", "Adam", "REGISTER #adam");
-	 * Returns an array of information regarding the command execution, if
-	 * If 'online' is set to yes, then the reply to the command was sent to the user on IRC.
-	 * If 'online' is set to no, then the reply to the command is in the array member 'return'
-	 */
-	function DoCommand($Service, $User, $Command)
-	{
-		return $this->RunXMLRPC("command", array($Service, $User, $Command));
-	}
+        return null;
+    }
 
-	/** Check an account/nick name and password to see if they are valid
-	 * Returns the account display name if valid
-	 */
-	function CheckAuthentication($Account, $Pass)
-	{
-		$ret = $this->RunXMLRPC("checkAuthentication", array($Account, $Pass));
+    /**
+     * Do Command on Service as User, eg:
+     * $anope->command("ChanServ", "Adam", "REGISTER #adam");
+     * Returns an array of information regarding the command execution, if
+     * If 'online' is set to yes, then the reply to the command was sent to the user on IRC.
+     * If 'online' is set to no, then the reply to the command is in the array member 'return'
+     *
+     * @param $service
+     * @param $user
+     * @param $command
+     * @return array|null
+     */
+    public function command($service, $user, $command)
+    {
+        return $this->run("command", [$service, $user, $command]);
+    }
 
-		if ($ret && $ret["result"] == "Success")
-			return $ret["account"];
-		return NULL;
-	}
+    /**
+     * Check an account/nick name and password to see if they are valid
+     * Returns the account display name if valid
+     *
+     * @param $account
+     * @param $pass
+     * @return string|null
+     */
+    public function auth($account, $pass)
+    {
+        $ret = $this->run("checkAuthentication", [$account, $pass]);
 
-	/* Returns an array of misc stats regarding Anope
-	 */
-	function DoStats()
-	{
-		return $this->RunXMLRPC("stats", NULL);
-	}
+        if ($ret && $ret["result"] == "Success") {
+            return $ret["account"];
+        }
 
-	/* Look up data for a channel
-	 * Returns an array containing channel information, or an array of size one
-	 * (just containing the name) if the channel does not exist
-	 */
-	function DoChannel($Channel)
-	{
-		return $this->RunXMLRPC("channel", array($Channel));
-	}
+        return null;
+    }
 
-	/* Like DoChannel(), but different.
-	 */
-	function DoUser($User)
-	{
-		return $this->RunXMLRPC("user", array($User));
-	}
+    /**
+     * Returns an array of misc stats regarding Anope
+     *
+     * @return array|null
+     */
+    public function stats()
+    {
+        return $this->run("stats", null);
+    }
+
+    /**
+     * Look up data for a channel
+     * Returns an array containing channel information, or an array of size one
+     * (just containing the name) if the channel does not exist
+     *
+     * @param $channel
+     * @return array|null
+     */
+    public function channel($channel)
+    {
+        return $this->run("channel", [$channel]);
+    }
+
+    /**
+     * Sent a notice to a user.
+     * Returns an array containing channel information, or an array of size one
+     * (just containing the name) if the channel does not exist
+     *
+     * @param $source
+     * @param $target
+     * @param $message
+     * @return array|null
+     */
+    public function notice($source, $target, $message)
+    {
+        return $this->run("notice", [$source, $target, $message]);
+    }
+
+    /**
+     * Like channel(), but different.
+     *
+     * @param $user
+     * @return array|null
+     */
+    public function user($user)
+    {
+        return $this->run("user", [$user]);
+    }
 }
 
-$anopexmlrpc = new AnopeXMLRPC("http://127.0.0.1:8080/xmlrpc");
-
-?>
+$anope = new AnopeXMLRPC("http://127.0.0.1:8080/xmlrpc");

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/>.
 #
 
 
@@ -148,12 +148,7 @@ while (1)
 
 	if ($input eq "q") {
 		if (-e "build/CMakeFiles") {
-			if (-e "cmake-bin") {
-				my $cmake_path = `find cmake-bin -name cmake -print0`;
-				system($cmake_path, "build/.");
-			} else {
-				system("cmake", "build/.");
-			}
+			system("cmake", "build/.");
 			print "\nNow cd build, then run make to build Anope.\n\n";
 		} else {
 			print "\nBuild directory not found. You should run ./Config now.\n\n"

include/CMakeLists.txt

@@ -1,64 +1,22 @@
 # 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}")
+set(version_BINARY "$<TARGET_FILE:version-bin>")
 # 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}
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  COMMAND version-bin ${Anope_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h
+  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)
   add_to_cpack_ignored_files("version.h$" TRUE)
   add_to_cpack_ignored_files("build.h$" TRUE)
-endif(NOT WIN32)
-
-set(PCH_SOURCES_GCH "")
-if(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
-  string(REPLACE " " ";" PCH_CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_FLAGS}")
-
-  file(GLOB PCH_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
-  sort_list(PCH_SOURCES)
-
-  foreach(PCH_SOURCE ${PCH_SOURCES})
-    find_includes(${PCH_SOURCE} INCLUDES)
-    set(INCLUDES_LIST)
-    append_to_list(INCLUDES_LIST ${PCH_SOURCE})
-    foreach(INCLUDE ${INCLUDES})
-      # Extract the filename from the #include line
-      extract_include_filename(${INCLUDE} FILENAME QUOTE_TYPE)
-      if(QUOTE_TYPE STREQUAL "quotes")
-        find_in_list(PCH_SOURCES "${FILENAME}" FOUND)
-        if(NOT FOUND EQUAL -1)
-          append_to_list(INCLUDES_LIST ${FILENAME})
-        endif(NOT FOUND EQUAL -1)
-      endif(QUOTE_TYPE STREQUAL "quotes")
-    endforeach(INCLUDE)
-
-    set(PCH_EXTRAFLAGS "")
-    if(DEBUG_BUILD)
-      set(PCH_EXTRAFLAGS "-g")
-    endif(DEBUG_BUILD)
-    if(PCH_SOURCE STREQUAL "module.h")
-      set(PCH_EXTRAFLAGS ${PCH_EXTRAFLAGS} -fPIC)
-    endif(PCH_SOURCE STREQUAL "module.h")
-    if(GETTEXT_INCLUDE)
-      set(PCH_GETTEXT_INCLUDE "-I${GETTEXT_INCLUDE}")
-    endif(GETTEXT_INCLUDE)
-
-    set(PCH_SOURCES_GCH "${PCH_SOURCES_GCH};${CMAKE_CURRENT_BINARY_DIR}/${PCH_SOURCE}.gch")
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PCH_SOURCE}.gch
-      COMMAND ${CMAKE_CXX_COMPILER} ARGS ${PCH_CXXFLAGS} ${PCH_EXTRAFLAGS}
-      ${PCH_GETTEXT_INCLUDE} -I${CMAKE_CURRENT_BINARY_DIR} -I${Anope_SOURCE_DIR}/modules/pseudoclients ${CMAKE_CURRENT_SOURCE_DIR}/${PCH_SOURCE} -o ${CMAKE_CURRENT_BINARY_DIR}/${PCH_SOURCE}.gch
-      DEPENDS ${INCLUDES_LIST} VERBATIM
-    )
-  endforeach(PCH_SOURCE ${PCH_SOURCES})
-endif(USE_PCH AND CMAKE_COMPILER_IS_GNUCXX)
+endif()
 
 # 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 ${CMAKE_CURRENT_BINARY_DIR}/version.h ${CMAKE_CURRENT_BINARY_DIR}/build.h)

include/access.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef ACCESS_H
-#define ACCESS_H
+#pragma once
 
 #include "services.h"
 #include "anope.h"
@@ -79,18 +77,14 @@ class CoreExport ChanAccess : public Serializable
 	Serialize::Reference<NickCore> nc;
 
  public:
-	typedef std::multimap<const ChanAccess *, const ChanAccess *> Set;
- 	/* shows the 'path' taken to determine if an access entry matches a user
-	 * .first are access entries checked
-	 * .second are access entries which match
-	 */
-	typedef std::pair<Set, Set> Path;
+	typedef std::vector<ChanAccess *> Path;
 
- 	/* The provider that created this access entry */
+	/* The provider that created this access entry */
 	AccessProvider *provider;
 	/* Channel this access entry is on */
 	Serialize::Reference<ChannelInfo> ci;
 	Anope::string creator;
+	Anope::string description;
 	time_t last_seen;
 	time_t created;
 
@@ -101,15 +95,17 @@ class CoreExport ChanAccess : public Serializable
 	const Anope::string &Mask() const;
 	NickCore *GetAccount() const;
 
-	void Serialize(Serialize::Data &data) const anope_override;
+	void Serialize(Serialize::Data &data) const override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
+	static const unsigned int MAX_DEPTH = 4;
+
 	/** Check if this access entry matches the given user or account
 	 * @param u The user
 	 * @param nc The account
-	 * @param p The path to the access object which matches will be put here
+	 * @param next Next channel to check if any
 	 */
-	virtual bool Matches(const User *u, const NickCore *nc, Path &p) const;
+	virtual bool Matches(const User *u, const NickCore *nc, ChannelInfo* &next) const;
 
 	/** Check if this access entry has the given privilege.
 	 * @param name The privilege name
@@ -137,13 +133,13 @@ class CoreExport ChanAccess : public Serializable
 /* A group of access entries. This is used commonly, for example with ChannelInfo::AccessFor,
  * to show what access a user has on a channel because users can match multiple access entries.
  */
-class CoreExport AccessGroup : public std::vector<ChanAccess *>
+class CoreExport AccessGroup
 {
  public:
+	/* access entries + paths */
+	std::vector<ChanAccess::Path> paths;
 	/* Channel these access entries are on */
- 	const ChannelInfo *ci;
-	/* Path from these entries to other entries that they depend on */
-	ChanAccess::Path path;
+	const ChannelInfo *ci;
 	/* Account these entries affect, if any */
 	const NickCore *nc;
 	/* super_admin always gets all privs. founder is a special case where ci->founder == nc */
@@ -171,7 +167,6 @@ class CoreExport AccessGroup : public std::vector<ChanAccess *>
 	bool operator<(const AccessGroup &other) const;
 	bool operator>=(const AccessGroup &other) const;
 	bool operator<=(const AccessGroup &other) const;
+
+	inline bool empty() const { return paths.empty(); }
 };
-
-#endif
-

include/account.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- * 
  */
 
-#ifndef ACCOUNT_H
-#define ACCOUNT_H
+#pragma once
 
 #include "extensible.h"
 #include "serialize.h"
@@ -21,12 +19,14 @@
 
 typedef Anope::hash_map<NickAlias *> nickalias_map;
 typedef Anope::hash_map<NickCore *> nickcore_map;
+typedef std::unordered_map<uint64_t, NickCore *> nickcoreid_map;
 
 extern CoreExport Serialize::Checker<nickalias_map> NickAliasList;
 extern CoreExport Serialize::Checker<nickcore_map> NickCoreList;
+extern CoreExport nickcoreid_map NickCoreIdList;
 
 /* A registered nickname.
- * It matters that Base is here before Extensible (it is inherited by Serializable) 
+ * It matters that Base is here before Extensible (it is inherited by Serializable)
  */
 class CoreExport NickAlias : public Serializable, public Extensible
 {
@@ -46,21 +46,21 @@ class CoreExport NickAlias : public Serializable, public Extensible
 	/* Account this nick is tied to. Multiple nicks can be tied to a single account. */
 	Serialize::Reference<NickCore> nc;
 
- 	/** Constructor
+	/** Constructor
 	 * @param nickname The nick
 	 * @param nickcore The nickcore for this nick
 	 */
 	NickAlias(const Anope::string &nickname, NickCore *nickcore);
 	~NickAlias();
 
-	void Serialize(Serialize::Data &data) const anope_override;
+	void Serialize(Serialize::Data &data) const override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
- 	/** Set a vhost for the user
+	/** Set a vhost for the user
 	 * @param ident The ident
 	 * @param host The host
 	 * @param creator Who created the vhost
-	 * @param time When the vhost was craated
+	 * @param time When the vhost was created
 	 */
 	void SetVhost(const Anope::string &ident, const Anope::string &host, const Anope::string &creator, time_t created = Anope::CurTime);
 
@@ -108,8 +108,10 @@ class CoreExport NickCore : public Serializable, public Extensible
 {
 	/* Channels which reference this core in some way (this is on their access list, akick list, is founder, successor, etc) */
 	Serialize::Checker<std::map<ChannelInfo *, int> > chanaccess;
+	/* Unique identifier for the account. */
+	uint64_t id;
  public:
- 	/* Name of the account. Find(display)->nc == this. */
+	/* Name of the account. Find(display)->nc == this. */
 	Anope::string display;
 	/* User password in form of hashm:data */
 	Anope::string pass;
@@ -127,7 +129,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	Serialize::Checker<std::vector<NickAlias *> > aliases;
 
-	/* Set if this user is a services operattor. o->ot must exist. */
+	/* Set if this user is a services operator. o->ot must exist. */
 	Oper *o;
 
 	/* Unsaved data */
@@ -141,11 +143,12 @@ class CoreExport NickCore : public Serializable, public Extensible
 
 	/** Constructor
 	 * @param display The display nick
+	 * @param id The account id
 	 */
-	NickCore(const Anope::string &nickdisplay);
+	NickCore(const Anope::string &nickdisplay, uint64_t nickid = 0);
 	~NickCore();
 
-	void Serialize(Serialize::Data &data) const anope_override;
+	void Serialize(Serialize::Data &data) const override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
 	/** Changes the display for this account
@@ -179,6 +182,9 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 */
 	unsigned GetAccessCount() const;
 
+	/** Retrieves the account id for this user */
+	uint64_t GetId();
+
 	/** Find an entry in the nick's access list
 	 *
 	 * @param entry The nick!ident@host entry to search for
@@ -215,7 +221,7 @@ class CoreExport NickCore : public Serializable, public Extensible
 	 * @return The account, if it exists
 	 */
 	static NickCore* Find(const Anope::string &nick);
-	
+
 	void AddChannelReference(ChannelInfo *ci);
 	void RemoveChannelReference(ChannelInfo *ci);
 	void GetChannelReferences(std::deque<ChannelInfo *> &queue);
@@ -227,15 +233,15 @@ class CoreExport NickCore : public Serializable, public Extensible
 class CoreExport IdentifyRequest
 {
 	/* Owner of this request, used to cleanup requests if a module is unloaded
-	 * while a reqyest us pending */
+	 * while a request us pending */
 	Module *owner;
 	Anope::string account;
 	Anope::string password;
 
 	std::set<Module *> holds;
-	bool dispatched;
-	bool success;
-	
+	bool dispatched = false;
+	bool success = false;
+
 	static std::set<IdentifyRequest *> Requests;
 
  protected:
@@ -243,10 +249,11 @@ class CoreExport IdentifyRequest
 	virtual ~IdentifyRequest();
 
  public:
- 	/* One of these is called when the request goes through */
+	/* One of these is called when the request goes through */
 	virtual void OnSuccess() = 0;
 	virtual void OnFail() = 0;
 
+	Module *GetOwner() const { return owner; }
 	const Anope::string &GetAccount() const { return account; }
 	const Anope::string &GetPassword() const { return password; }
 
@@ -254,17 +261,17 @@ class CoreExport IdentifyRequest
 	 * for the request to complete. Multiple modules may hold a request at any time,
 	 * but the request is not complete until every module has released it. If you do not
 	 * require holding this (eg, your password check is done in this thread and immediately)
-	 * then you don't need to hold the request before Successing it.
+	 * then you don't need to hold the request before calling `Success()`.
 	 * @param m The module holding this request
 	 */
 	void Hold(Module *m);
 
 	/** Releases a held request
-	 * @param m The module releaseing the hold
+	 * @param m The module releasing the hold
 	 */
 	void Release(Module *m);
 
-	/** Called by modules when this IdentifyRequest has successeded successfully.
+	/** Called by modules when this IdentifyRequest has succeeded.
 	 * If this request is behind held it must still be Released after calling this.
 	 * @param m The module confirming authentication
 	 */
@@ -278,5 +285,3 @@ class CoreExport IdentifyRequest
 
 	static void ModuleUnload(Module *m);
 };
-
-#endif // ACCOUNT_H

include/anope.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef ANOPE_H
-#define ANOPE_H
+#pragma once
 
 #include <signal.h>
 
@@ -55,6 +53,7 @@ namespace Anope
 		string(const ci::string &_str) : _string(_str.c_str()) { }
 		string(const string &_str, size_type pos, size_type n = npos) : _string(_str._string, pos, n) { }
 		template <class InputIterator> string(InputIterator first, InputIterator last) : _string(first, last) { }
+		string(const string &) = default;
 
 		/**
 		 * Assignment operators, so any type of string can be assigned to this class.
@@ -255,8 +254,8 @@ namespace Anope
 		inline string lower() const
 		{
 			Anope::string new_string = *this;
-			for (size_type i = 0; i < new_string.length(); ++i)
-				new_string[i] = Anope::tolower(new_string[i]);
+			for (auto &chr : new_string)
+				chr = Anope::tolower(chr);
 			return new_string;
 		}
 
@@ -266,8 +265,8 @@ namespace Anope
 		inline string upper() const
 		{
 			Anope::string new_string = *this;
-			for (size_type i = 0; i < new_string.length(); ++i)
-				new_string[i] = Anope::toupper(new_string[i]);
+			for (auto &chr : new_string)
+				chr = Anope::toupper(chr);
 			return new_string;
 		}
 
@@ -313,7 +312,7 @@ namespace Anope
 	{
 		inline size_t operator()(const string &s) const
 		{
-			return TR1NS::hash<std::string>()(s.lower().str());
+			return std::hash<std::string>()(s.lower().str());
 		}
 	};
 
@@ -321,7 +320,7 @@ namespace Anope
 	{
 		inline size_t operator()(const string &s) const
 		{
-			return TR1NS::hash<std::string>()(s.str());
+			return std::hash<std::string>()(s.str());
 		}
 	};
 
@@ -335,9 +334,11 @@ namespace Anope
 
 	template<typename T> class map : public std::map<string, T, ci::less> { };
 	template<typename T> class multimap : public std::multimap<string, T, ci::less> { };
-	template<typename T> class hash_map : public TR1NS::unordered_map<string, T, hash_ci, compare> { };
+	template<typename T> class hash_map : public std::unordered_map<string, T, hash_ci, compare> { };
 
+#ifndef REPRODUCIBLE_BUILD
 	static const char *const compiled = __TIME__ " " __DATE__;
+#endif
 
 	/** The time Anope started.
 	 */
@@ -361,15 +362,15 @@ namespace Anope
 	 */
 	extern CoreExport int Debug;
 
-	/** Other comand line options.
+	/** Other command line options.
 	 */
 	extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug;
 
-	/** The root of the services installation. Usually ~/services
+	/** The root of the Anope installation. Usually ~/anope
 	 */
 	extern CoreExport Anope::string ServicesDir;
 
-	/** Services binary name (eg services)
+	/** Anope binary name (eg anope)
 	 */
 	extern CoreExport Anope::string ServicesBin;
 
@@ -383,7 +384,7 @@ namespace Anope
 
 	/** The uplink we are currently connected to
 	 */
-	extern CoreExport int CurrentUplink;
+	extern CoreExport size_t CurrentUplink;
 
 	/** Various methods to determine the Anope version running
 	 */
@@ -402,7 +403,7 @@ namespace Anope
 
 	/** Used to "fork" the process and go into the background during initial startup
 	 * while we are AtTerm(). The actual fork is not done here, but earlier, and this
-	 * simply notifys the parent via kill() to exit().
+	 * simply notifies the parent via kill() to exit().
 	 */
 	extern void Fork();
 
@@ -412,7 +413,7 @@ namespace Anope
 
 	/** One of the first functions called, does general initialization such as reading
 	 * command line args, loading the configuration, doing the initial fork() if necessary,
-	 * initializating language support, loading modules, and loading databases.
+	 * initializing language support, loading modules, and loading databases.
 	 * @throws CoreException if something bad went wrong
 	 */
 	extern void Init(int ac, char **av);
@@ -442,13 +443,13 @@ namespace Anope
 	 */
 	extern CoreExport void Unhex(const string &src, string &dest);
 	extern CoreExport void Unhex(const string &src, char *dest, size_t sz);
-	
+
 	/** Base 64 encode a string
 	 * @param src The string to encode
 	 * @param target Where the encoded string is placed
 	 */
 	extern CoreExport void B64Encode(const string &src, string &target);
-	
+
 	/** Base 64 decode a string
 	 * @param src The base64 encoded string
 	 * @param target The plain text result
@@ -461,13 +462,12 @@ namespace Anope
 	 */
 	extern CoreExport void Encrypt(const Anope::string &src, Anope::string &dest);
 
-	/** Decrypts what is in 'src' to 'dest'.
-	 * @param src The source string to decrypt
-	 * @param dest The destination where the decrypted string is placed
-	 * @return true if decryption was successful. This is usually not the case
-	 * as most encryption methods we use are one way.
+	/** Hashes a buffer with SipHash-2-4
+	 * @param src The start of the buffer to hash
+	 * @param src_sz The total number of bytes in the buffer
+	 * @param key A 16 byte key to hash the buffer with.
 	 */
-	extern CoreExport bool Decrypt(const Anope::string &src, Anope::string &dest);
+	extern CoreExport uint64_t SipHash24(const void *src, unsigned long src_sz, const char key[16]);
 
 	/** Returns a sequence of data formatted as the format argument specifies.
 	 ** After the format parameter, the function expects at least as many
@@ -537,13 +537,20 @@ namespace Anope
 	 */
 	extern Anope::string Resolve(const Anope::string &host, int type);
 
+	/** Does a blocking dns query and returns all IPs.
+	 * @param host host to look up
+	 * @param type inet addr type
+	 * @return A list of all IPs that the host resolves to
+	 */
+	extern std::vector<Anope::string> ResolveMultiple(const Anope::string &host, int type);
+
 	/** Generate a string of random letters and numbers
 	 * @param len The length of the string returned
 	 */
 	extern CoreExport Anope::string Random(size_t len);
 }
 
-/** sepstream allows for splitting token seperated lists.
+/** sepstream allows for splitting token separated lists.
  * Each successive call to sepstream::GetToken() returns
  * the next token, until none remain, at which point the method returns
  * an empty string.
@@ -559,14 +566,14 @@ class CoreExport sepstream
 	char sep;
 	/** Current string position
 	 */
-	size_t pos;
+	size_t pos = 0;
 	/** If set then GetToken() can return an empty string
 	 */
 	bool allow_empty;
  public:
 	/** Create a sepstream and fill it with the provided data
 	 */
-	sepstream(const Anope::string &source, char seperator, bool allowempty = false);
+	sepstream(const Anope::string &source, char separator, bool allowempty = false);
 
 	/** Fetch the next token from the stream
 	 * @param token The next token from the stream is placed here
@@ -576,7 +583,7 @@ class CoreExport sepstream
 
 	/** Gets token number 'num' from the stream
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetToken(Anope::string &token, int num);
@@ -594,7 +601,7 @@ class CoreExport sepstream
 
 	/** Gets token number 'num' from the stream and all remaining tokens.
 	 * @param token The token is placed here
-	 * @param num The token number to featch
+	 * @param num The token number to fetch
 	 * @return True if the token was able to be fetched
 	 */
 	bool GetTokenRemainder(Anope::string &token, int num);
@@ -615,22 +622,22 @@ class CoreExport sepstream
 	bool StreamEnd();
 };
 
-/** A derived form of sepstream, which seperates on commas
+/** A derived form of sepstream, which separates on commas
  */
 class commasepstream : public sepstream
 {
  public:
-	/** Initialize with comma seperator
+	/** Initialize with comma separator
 	 */
 	commasepstream(const Anope::string &source, bool allowempty = false) : sepstream(source, ',', allowempty) { }
 };
 
-/** A derived form of sepstream, which seperates on spaces
+/** A derived form of sepstream, which separates on spaces
  */
 class spacesepstream : public sepstream
 {
  public:
-	/** Initialize with space seperator
+	/** Initialize with space separator
 	 */
 	spacesepstream(const Anope::string &source) : sepstream(source, ' ') { }
 };
@@ -651,7 +658,7 @@ class CoreException : public std::exception
 	 */
 	Anope::string source;
  public:
-	/** Default constructor, just uses the error mesage 'Core threw an exception'.
+	/** Default constructor, just uses the error message 'Core threw an exception'.
 	 */
 	CoreException() : err("Core threw an exception"), source("The core") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -665,7 +672,7 @@ class CoreException : public std::exception
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
 	 */
-	virtual ~CoreException() throw() { }
+	virtual ~CoreException() noexcept = default;
 	/** Returns the reason for the exception.
 	 * The module should probably put something informative here as the user will see this upon failure.
 	 */
@@ -683,7 +690,7 @@ class CoreException : public std::exception
 class ModuleException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Module threw an exception'.
+	/** Default constructor, just uses the error message 'Module threw an exception'.
 	 */
 	ModuleException() : CoreException("Module threw an exception", "A Module") { }
 
@@ -694,7 +701,7 @@ class ModuleException : public CoreException
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
 	 */
-	virtual ~ModuleException() throw() { }
+	virtual ~ModuleException() noexcept = default;
 };
 
 class ConvertException : public CoreException
@@ -702,7 +709,7 @@ class ConvertException : public CoreException
  public:
 	ConvertException(const Anope::string &reason = "") : CoreException(reason) { }
 
-	virtual ~ConvertException() throw() { }
+	virtual ~ConvertException() noexcept = default;
 };
 
 /** Convert something to a string
@@ -758,7 +765,7 @@ template<typename T> inline T convertTo(const Anope::string &s, bool failIfLefto
 }
 
 /** Casts to be used instead of dynamic_cast, this uses dynamic_cast
- * for debug builds and static_cast on releass builds
+ * for debug builds and static_cast on release builds
  * to speed up the program because dynamic_cast relies on RTTI.
  */
 #ifdef DEBUG_BUILD
@@ -776,5 +783,3 @@ template<typename T, typename O> inline T anope_dynamic_static_cast(O ptr)
 	return static_cast<T>(ptr);
 }
 #endif
-
-#endif // ANOPE_H

include/base.h

@@ -1,14 +1,12 @@
 /*
  *
- * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Adam <Adam@anope.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
-#ifndef BASE_H
-#define BASE_H
+#pragma once
 
 #include "services.h"
 
@@ -17,9 +15,8 @@
 class CoreExport Base
 {
 	/* References to this base class */
-	std::set<ReferenceBase *> *references;
+	std::set<ReferenceBase *> *references = nullptr;
  public:
-	Base();
 	virtual ~Base();
 
 	/** Adds a reference to this object. Eg, when a Reference
@@ -34,11 +31,11 @@ class CoreExport Base
 class ReferenceBase
 {
  protected:
-	bool invalid;
+	bool invalid = false;
  public:
-	ReferenceBase() : invalid(false) { }
+	ReferenceBase() = default;
 	ReferenceBase(const ReferenceBase &other) : invalid(other.invalid) { }
-	virtual ~ReferenceBase() { }
+	virtual ~ReferenceBase() = default;
 	inline void Invalidate() { this->invalid = true; }
 };
 
@@ -49,11 +46,9 @@ template<typename T>
 class Reference : public ReferenceBase
 {
  protected:
-	T *ref;
+	T *ref = nullptr;
  public:
- 	Reference() : ref(NULL)
-	{
-	}
+	Reference() = default;
 
 	Reference(T *obj) : ref(obj)
 	{
@@ -140,6 +135,3 @@ class Reference : public ReferenceBase
 		return false;
 	}
 };
-
-#endif // BASE_H
-

include/bots.h

@@ -1,14 +1,12 @@
 /*
  *
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
-#ifndef BOTS_H
-#define BOTS_H
+#pragma once
 
 #include "users.h"
 #include "anope.h"
@@ -132,5 +130,3 @@ class CoreExport BotInfo : public User, public Serializable
 	 */
 	static BotInfo* Find(const Anope::string &nick, bool nick_only = false);
 };
-
-#endif // BOTS_H

include/channels.h

@@ -1,14 +1,12 @@
 /* Channel support
  *
- * (C) 2008-2014 Anope Team
+ * (C) 2008-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
-#ifndef CHANNELS_H
-#define CHANNELS_H
+#pragma once
 
 #include "anope.h"
 #include "extensible.h"
@@ -32,6 +30,8 @@ struct ChanUserContainer : public Extensible
 
 class CoreExport Channel : public Base, public Extensible
 {
+	static std::vector<Channel *> deleting;
+
  public:
 	typedef std::multimap<Anope::string, Anope::string> ModeList;
  private:
@@ -40,7 +40,7 @@ class CoreExport Channel : public Base, public Extensible
 	ModeList modes;
 
  public:
- 	/* Channel name */
+	/* Channel name */
 	Anope::string name;
 	/* Set if this channel is registered. ci->c == this. Contains information relevant to the registered channel */
 	Serialize::Reference<ChannelInfo> ci;
@@ -59,7 +59,7 @@ class CoreExport Channel : public Base, public Extensible
 	Anope::string topic;
 	/* Who set the topic */
 	Anope::string topic_setter;
-	/* The timestamp associated with the topic. Not necessarually anywhere close to Anope::CurTime.
+	/* The timestamp associated with the topic. Not necessarily anywhere close to Anope::CurTime.
 	 * This is the time the topic was *originally set*. When we restore the topic we want to change the TS back
 	 * to this, but we can only do this on certain IRCds.
 	 */
@@ -138,7 +138,7 @@ class CoreExport Channel : public Base, public Extensible
 	/** See if a channel has a mode
 	 * @param name The mode name
 	 * @return The number of modes set
- 	 * @param param The optional mode param
+	 * @param param The optional mode param
 	 */
 	size_t HasMode(const Anope::string &name, const Anope::string &param = "");
 
@@ -231,7 +231,7 @@ class CoreExport Channel : public Base, public Extensible
 	 * @param bi The sender, can be NULL for the service bot for this channel
 	 * @param u The user being kicked
 	 * @param reason The reason for the kick
-	 * @return true if the kick was scucessful, false if a module blocked the kick
+	 * @return true if the kick was successful, false if a module blocked the kick
 	 */
 	bool Kick(BotInfo *bi, User *u, const char *reason = NULL, ...);
 
@@ -248,7 +248,7 @@ class CoreExport Channel : public Base, public Extensible
 
 	/** Get a string of the modes set on this channel
 	 * @param complete Include mode parameters
-	 * @param plus If set to false (with complete), mode parameters will not be given for modes requring no parameters to be unset
+	 * @param plus If set to false (with complete), mode parameters will not be given for modes requiring no parameters to be unset
 	 * @return A mode string
 	 */
 	Anope::string GetModes(bool complete, bool plus);
@@ -288,6 +288,11 @@ class CoreExport Channel : public Base, public Extensible
 	 */
 	bool CheckKick(User *user);
 
+	/** Find which bot should send mode/topic/etc changes for this channel
+	 * @return The bot
+	 */
+	BotInfo *WhoSends() const;
+
 	/** Finds a channel
 	 * @param name The channel to find
 	 * @return The channel, if found
@@ -300,6 +305,8 @@ class CoreExport Channel : public Base, public Extensible
 	 * @param ts The time the channel was created
 	 */
 	static Channel *FindOrCreate(const Anope::string &name, bool &created, time_t ts = Anope::CurTime);
-};
 
-#endif // CHANNELS_H
+	void QueueForDeletion();
+
+	static void DeleteChannels();
+};

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,8 +9,7 @@
  * Based on the original code of Services by Andy Church.
  */
 
-#ifndef COMMAND_H
-#define COMMAND_H
+#pragma once
 
 #include "service.h"
 #include "anope.h"
@@ -26,8 +25,6 @@ struct CommandInfo
 {
 	typedef Anope::map<CommandInfo> map;
 
-	CommandInfo() : hide(false), prepend_channel(false) { }
-
 	/* Service name of the command */
 	Anope::string name;
 	/* Permission required to execute the command */
@@ -35,17 +32,17 @@ struct CommandInfo
 	/* Group this command is in */
 	Anope::string group;
 	/* whether or not to hide this command in help output */
-	bool hide;
+	bool hide = false;
 	/* Only used with fantasy */
-	bool prepend_channel;
+	bool prepend_channel = false;
 };
 
-/* Where the replies from commands go to. User inheits from this and is the normal
+/* Where the replies from commands go to. User inherits from this and is the normal
  * source of a CommandReply
  */
 struct CoreExport CommandReply
 {
-	virtual ~CommandReply() { }
+	virtual ~CommandReply() = default;
 	virtual void SendMessage(BotInfo *source, const Anope::string &msg) = 0;
 };
 
@@ -59,6 +56,8 @@ class CoreExport CommandSource
  public:
 	/* The account executing the command */
 	Reference<NickCore> nc;
+	/* for web clients */
+	Anope::string ip;
 	/* Where the reply should go */
 	CommandReply *reply;
 	/* Channel the command was executed on (fantasy) */
@@ -99,7 +98,7 @@ class CoreExport Command : public Service
 	bool require_user;
 
  public:
- 	/* Maximum paramaters accepted by this command */
+	/* Maximum parameters accepted by this command */
 	size_t max_params;
 	/* Minimum parameters required to use this command */
 	size_t min_params;
@@ -118,7 +117,7 @@ class CoreExport Command : public Service
 	Command(Module *owner, const Anope::string &sname, size_t min_params, size_t max_params = 0);
 
  public:
-	virtual ~Command();
+	virtual ~Command() = default;
 
  protected:
 	void SetDesc(const Anope::string &d);
@@ -134,11 +133,11 @@ class CoreExport Command : public Service
 	bool AllowUnregistered() const;
 	bool RequireUser() const;
 
- 	/** Get the command description
+	/** Get the command description
 	 * @param source The source wanting the command description
 	 * @return The commands description
 	 */
- 	virtual const Anope::string GetDesc(CommandSource &source) const;
+	virtual const Anope::string GetDesc(CommandSource &source) const;
 
 	/** Execute this command.
 	 * @param source The source
@@ -146,7 +145,7 @@ class CoreExport Command : public Service
 	 */
 	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;
 
-	/** Called when HELP is requsted for the client this command is on.
+	/** Called when HELP is requested for the client this command is on.
 	 * @param source The source
 	 */
 	virtual void OnServHelp(CommandSource &source);
@@ -176,10 +175,8 @@ class CoreExport Command : public Service
 	 * Note that if the same command exists multiple places this will return the first one encountered
 	 * @param command_service The command service to lookup, eg, nickserv/register
 	 * @param bot If found, is set to the bot the command is on, eg NickServ
-	 * @param name If found, is set to the comand name, eg REGISTER
+	 * @param name If found, is set to the command name, eg REGISTER
 	 * @return true if the given command service exists
 	 */
 	static bool FindCommandFromService(const Anope::string &command_service, BotInfo* &bi, Anope::string &name);
 };
-
-#endif // COMMANDS_H

include/config.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "account.h"
 #include "regchannel.h"
@@ -21,9 +19,11 @@
 
 namespace Configuration
 {
+	namespace Internal
+	{
 	class CoreExport Block
 	{
-		friend struct Conf;
+		friend struct Configuration::Conf;
 
 	 public:
 		typedef Anope::map<Anope::string> item_map;
@@ -35,13 +35,17 @@ namespace Configuration
 		block_map blocks;
 		int linenum;
 
-	 public:
-	 	Block(const Anope::string &);
-		const Anope::string &GetName() const;
-		int CountBlock(const Anope::string &name);
-		Block* GetBlock(const Anope::string &name, int num = 0);
+		/* Represents a missing tag. */
+		static Block EmptyBlock;
 
-		template<typename T> inline T Get(const Anope::string &tag)
+	 public:
+		Block(const Anope::string &);
+		const Anope::string &GetName() const;
+		int CountBlock(const Anope::string &name) const;
+		const Block* GetBlock(const Anope::string &name, int num = 0) const;
+		Block* GetMutableBlock(const Anope::string &name, int num = 0);
+
+		template<typename T> inline T Get(const Anope::string &tag) const
 		{
 			return this->Get<T>(tag, "");
 		}
@@ -61,12 +65,16 @@ namespace Configuration
 		}
 
 		bool Set(const Anope::string &tag, const Anope::string &value);
-		const item_map* GetItems() const;
+		const item_map &GetItems() const;
 	};
 
 	template<> CoreExport const Anope::string Block::Get(const Anope::string &tag, const Anope::string& def) const;
 	template<> CoreExport time_t Block::Get(const Anope::string &tag, const Anope::string &def) const;
 	template<> CoreExport bool Block::Get(const Anope::string &tag, const Anope::string &def) const;
+	} // namespace Internal
+
+	typedef const Internal::Block Block;
+	typedef Internal::Block MutableBlock;
 
 	/** Represents a configuration file
 	 */
@@ -74,11 +82,12 @@ namespace Configuration
 	{
 		Anope::string name;
 		bool executable;
-		FILE *fp;
+		FILE *fp = nullptr;
 	 public:
 		File(const Anope::string &, bool);
 		~File();
 		const Anope::string &GetName() const;
+		Anope::string GetPath() const;
 
 		bool IsOpen() const;
 		bool Open();
@@ -140,7 +149,7 @@ namespace Configuration
 
 		BotInfo *GetClient(const Anope::string &name);
 
-		Block *GetCommand(CommandSource &);
+		const Block *GetCommand(CommandSource &);
 	};
 
 	struct Uplink
@@ -148,10 +157,10 @@ namespace Configuration
 		Anope::string host;
 		unsigned port;
 		Anope::string password;
-		bool ipv6;
+		int protocol;
 
-		Uplink(const Anope::string &_host, int _port, const Anope::string &_password, bool _ipv6) : host(_host), port(_port), password(_password), ipv6(_ipv6) { }
-		inline bool operator==(const Uplink &other) const { return host == other.host && port == other.port && password == other.password && ipv6 == other.ipv6; }
+		Uplink(const Anope::string &_host, int _port, const Anope::string &_password, int _protocol) : host(_host), port(_port), password(_password), protocol(_protocol) { }
+		inline bool operator==(const Uplink &other) const { return host == other.host && port == other.port && password == other.password && protocol == other.protocol; }
 		inline bool operator!=(const Uplink &other) const { return !(*this == other); }
 	};
 }
@@ -165,7 +174,7 @@ namespace Configuration
 class ConfigException : public CoreException
 {
  public:
-	/** Default constructor, just uses the error mesage 'Config threw an exception'.
+	/** Default constructor, just uses the error message 'Config threw an exception'.
 	 */
 	ConfigException() : CoreException("Config threw an exception", "Config Parser") { }
 	/** This constructor can be used to specify an error message before throwing.
@@ -175,10 +184,8 @@ class ConfigException : public CoreException
 	 * Actually no, it does nothing. Never mind.
 	 * @throws Nothing!
 	 */
-	virtual ~ConfigException() throw() { }
+	virtual ~ConfigException() noexcept = default;
 };
 
 extern Configuration::File ServicesConf;
 extern CoreExport Configuration::Conf *Config;
-
-#endif // CONFIG_H

include/defs.h

@@ -1,15 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
+#pragma once
 
 class AccessGroup;
 class AutoKick;
@@ -53,4 +53,3 @@ struct MemoInfo;
 struct ModeLock;
 struct Oper;
 namespace SASL { struct Message; }
-

include/extensible.h

@@ -1,14 +1,12 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
-#ifndef EXTENSIBLE_H
-#define EXTENSIBLE_H
+#pragma once
 
 #include "anope.h"
 #include "serialize.h"
@@ -40,6 +38,8 @@ class CoreExport Extensible
 
 	virtual ~Extensible();
 
+	void UnsetExtensibles();
+
 	template<typename T> T* GetExt(const Anope::string &name) const;
 	bool HasExt(const Anope::string &name) const;
 
@@ -92,7 +92,7 @@ class BaseExtensibleItem : public ExtensibleBase
 		return t;
 	}
 
-	void Unset(Extensible *obj) anope_override
+	void Unset(Extensible *obj) override
 	{
 		T *value = Get(obj);
 		items.erase(obj);
@@ -127,7 +127,7 @@ template<typename T>
 class ExtensibleItem : public BaseExtensibleItem<T>
 {
  protected:
-	T* Create(Extensible *obj) anope_override
+	T* Create(Extensible *obj) override
 	{
 		return new T(obj);
 	}
@@ -139,7 +139,7 @@ template<typename T>
 class PrimitiveExtensibleItem : public BaseExtensibleItem<T>
 {
  protected:
-	T* Create(Extensible *obj) anope_override
+	T* Create(Extensible *obj) override
 	{
 		return new T();
 	}
@@ -151,7 +151,7 @@ template<>
 class PrimitiveExtensibleItem<bool> : public BaseExtensibleItem<bool>
 {
  protected:
-	bool* Create(Extensible *) anope_override
+	bool* Create(Extensible *) override
 	{
 		return NULL;
 	}
@@ -163,15 +163,15 @@ template<typename T>
 class SerializableExtensibleItem : public PrimitiveExtensibleItem<T>
 {
  public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<T>(m, n) { }
 
-	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
+	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
 	{
 		T* t = this->Get(e);
 		data[this->name] << *t;
 	}
 
-	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override
+	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override
 	{
 		T t;
 		if (data[this->name] >> t)
@@ -185,14 +185,14 @@ template<>
 class SerializableExtensibleItem<bool> : public PrimitiveExtensibleItem<bool>
 {
  public:
- 	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
+	SerializableExtensibleItem(Module *m, const Anope::string &n) : PrimitiveExtensibleItem<bool>(m, n) { }
 
-	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const anope_override
+	void ExtensibleSerialize(const Extensible *e, const Serializable *s, Serialize::Data &data) const override
 	{
 		data[this->name] << true;
 	}
 
-	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) anope_override
+	void ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) override
 	{
 		bool b = false;
 		data[this->name] >> b;
@@ -258,5 +258,3 @@ void Extensible::Shrink(const Anope::string &name)
 	else
 		Log(LOG_DEBUG) << "Shrink for nonexistent type " << name << " on " << static_cast<void *>(this);
 }
-
-#endif // EXTENSIBLE_H

include/hashcomp.h

@@ -1,25 +1,16 @@
 /*
  *
- * Copyright (C) 2002-2011 InspIRCd Development Team
- * Copyright (C) 2009-2014 Anope Team <team@anope.org>
+ * (C) 2002-2011 InspIRCd Development Team
+ * (C) 2009-2023 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
-#ifndef HASHCOMP_H
-#define HASHCOMP_H
+#pragma once
 
 #include <string>
 #include <locale>
-
-#if defined _LIBCPP_VERSION || defined _WIN32
 #include <unordered_map>
-#define TR1NS std
-#else
-#include <tr1/unordered_map>
-#define TR1NS std::tr1
-#endif
 
 #include "services.h"
 
@@ -27,19 +18,19 @@ namespace Anope
 {
 	class string;
 
-	/* Casemap in use by Anope. ci::string's comparation functions use this (and thus Anope::string) */
+	/* Casemap in use by Anope. ci::string's comparison functions use this (and thus Anope::string) */
 	extern std::locale casemap;
 
-	extern void CaseMapRebuild();
-	extern unsigned char tolower(unsigned char);
-	extern unsigned char toupper(unsigned char);
+	extern CoreExport void CaseMapRebuild();
+	extern CoreExport unsigned char tolower(unsigned char);
+	extern CoreExport unsigned char toupper(unsigned char);
 
 	/* ASCII case insensitive ctype. */
 	template<typename char_type>
 	class ascii_ctype : public std::ctype<char_type>
 	{
 	 public:
-		char_type do_toupper(char_type c) const anope_override
+		char_type do_toupper(char_type c) const override
 		{
 			if (c >= 'a' && c <= 'z')
 				return c - 32;
@@ -47,7 +38,7 @@ namespace Anope
 				return c;
 		}
 
-		char_type do_tolower(char_type c) const anope_override
+		char_type do_tolower(char_type c) const override
 		{
 			if (c >= 'A' && c <= 'Z')
 				return c + 32;
@@ -61,7 +52,7 @@ namespace Anope
 	class rfc1459_ctype : public ascii_ctype<char_type>
 	{
 	 public:
-		char_type do_toupper(char_type c) const anope_override
+		char_type do_toupper(char_type c) const override
 		{
 			if (c == '{' || c == '}' || c == '|')
 				return c - 32;
@@ -69,7 +60,7 @@ namespace Anope
 				return ascii_ctype<char_type>::do_toupper(c);
 		}
 
-		char_type do_tolower(char_type c) const anope_override
+		char_type do_tolower(char_type c) const override
 		{
 			if (c == '[' || c == ']' || c == '\\')
 				return c + 32;
@@ -123,7 +114,7 @@ namespace ci
 		 * @param s1 String to find in
 		 * @param n Position to search up to
 		 * @param c Character to search for
-		 * @return Pointer to the first occurance of c in s1
+		 * @return Pointer to the first occurrence of c in s1
 		 */
 		static const char *find(const char *s1, int n, char c);
 	};
@@ -196,5 +187,3 @@ inline bool operator!=(const std::string &leftval, const ci::string &rightval)
 {
 	return !(leftval.c_str() == rightval);
 }
-
-#endif // HASHCOMP_H

include/language.h

@@ -1,18 +1,19 @@
 /*
  *
- * (C) 2008-2014 Anope Team
+ * (C) 2008-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
+#pragma once
+
 #include "anope.h"
 
 namespace Language
 {
 
-	/* Languages we support as configured in services.conf. They are
+	/* Languages we support as configured in anope.conf. They are
 	 * added to this list if we detect a language exists in the correct
 	 * location for each language.
 	 */
@@ -24,7 +25,7 @@ namespace Language
 	 * and we detect a language file exists for at least one of the supported
 	 * languages for the module, then we add the module's domain (its name)
 	 * here.
-	 * 
+	 *
 	 * When strings are translated they are checked against all domains.
 	 */
 	extern std::vector<Anope::string> Domains;
@@ -41,7 +42,7 @@ namespace Language
 	extern CoreExport const char *Translate(const char *string);
 
 	/** Translates a string to the language of the given user.
-	 * @param u The user to transate the string for
+	 * @param u The user to translate the string for
 	 * @param string A string to translate
 	 * @return The translated string if found, else the original string.
 	 */
@@ -71,10 +72,11 @@ namespace Language
 #define READ_ONLY_MODE			_("Services are in read-only mode!")
 #define PASSWORD_INCORRECT		_("Password incorrect.")
 #define ACCESS_DENIED			_("Access denied.")
-#define MORE_OBSCURE_PASSWORD		_("Please try again with a more obscure password. Passwords should be at least\n" \
-						"five characters long, should not be something easily guessed\n" \
-						"(e.g. your real name or your nick), and cannot contain the space or tab characters.")
-#define PASSWORD_TOO_LONG		_("Your password is too long. It must not exceed %u characters.")
+#define MORE_OBSCURE_PASSWORD		_("Please try again with a more obscure password. Passwords should not be\n" \
+						"something that could be easily guessed (e.g. your real name or your nick) and\n" \
+						"cannot contain the space or tab characters.\n")
+#define PASSWORD_TOO_SHORT		_("Your password is too short. It must must be longer than %u characters.")
+#define PASSWORD_TOO_LONG		_("Your password is too long. It must be shorter than %u characters.")
 #define NICK_NOT_REGISTERED		_("Your nick isn't registered.")
 #define NICK_X_NOT_REGISTERED		_("Nick \002%s\002 isn't registered.")
 #define NICK_X_NOT_IN_USE		_("Nick \002%s\002 isn't currently in use.")
@@ -83,7 +85,7 @@ namespace Language
 #define CHAN_X_SUSPENDED		_("Channel %s is currently suspended.")
 #define CHAN_X_NOT_REGISTERED		_("Channel \002%s\002 isn't registered.")
 #define CHAN_X_NOT_IN_USE		_("Channel \002%s\002 doesn't exist.")
-#define NICK_IDENTIFY_REQUIRED		_("Password authentication required for that command.")
+#define NICK_IDENTIFY_REQUIRED		_("You must be logged into an account to use that command.")
 #define MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
 #define UNKNOWN				_("<unknown>")
 #define NO_EXPIRE			_("does not expire")
@@ -126,4 +128,3 @@ namespace Language
 #define HOST_SET_IDENTTOOLONG		_("Error! The vHost ident is too long, please use an ident shorter than %d characters.")
 #define HOST_NOT_ASSIGNED		_("Please contact an Operator to get a vHost assigned to this nick.")
 #define HOST_NO_VIDENT			_("Your IRCd does not support vIdent's, if this is incorrect, please report this as a possible bug")
-

include/lists.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef LISTS_H
-#define LISTS_H
+#pragma once
 
 #include "services.h"
 #include "anope.h"
@@ -26,7 +24,7 @@
 class CoreExport NumberList
 {
  private:
-	bool is_valid;
+	bool is_valid = true;
 
 	std::set<unsigned> numbers;
 
@@ -40,7 +38,7 @@ class CoreExport NumberList
 
 	/** Destructor, does nothing
 	 */
-	virtual ~NumberList();
+	virtual ~NumberList() = default;
 
 	/** Should be called after the constructors are done running. This calls the callbacks.
 	 */
@@ -52,7 +50,7 @@ class CoreExport NumberList
 	virtual void HandleNumber(unsigned number);
 
 	/** Called when there is an error with the numbered list
-	 * Return false to immediatly stop processing the list and return
+	 * Return false to immediately stop processing the list and return
 	 * This is all done before we start calling HandleNumber, so no numbers will have been processed yet
 	 * @param list The list
 	 * @return false to stop processing
@@ -65,7 +63,7 @@ class CoreExport NumberList
 class CoreExport ListFormatter
 {
  public:
- 	typedef std::map<Anope::string, Anope::string> ListEntry;
+	typedef std::map<Anope::string, Anope::string> ListEntry;
  private:
 	NickCore *nc;
 	std::vector<Anope::string> columns;
@@ -84,13 +82,10 @@ class CoreExport InfoFormatter
 {
 	NickCore *nc;
 	std::vector<std::pair<Anope::string, Anope::string> > replies;
-	unsigned longest;
+	unsigned longest = 0;
  public:
 	InfoFormatter(NickCore *nc);
 	void Process(std::vector<Anope::string> &);
 	Anope::string &operator[](const Anope::string &key);
 	void AddOption(const Anope::string &opt);
 };
-
-#endif // LISTS_H
-

include/logger.h

@@ -1,26 +1,24 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef LOGGER_H
-#define LOGGER_H
+#pragma once
 
 #include "anope.h"
 #include "defs.h"
 
 enum LogType
 {
-	/* Used whenever an administrator uses an administrative comand */
+	/* Used whenever an administrator uses an administrative command */
 	LOG_ADMIN,
-	/* Used whenever an administrator overides something, such as adding
+	/* Used whenever an administrator overrides something, such as adding
 	 * access to a channel where they don't have permission to.
 	 */
 	LOG_OVERRIDE,
@@ -53,24 +51,24 @@ struct LogFile
 class CoreExport Log
 {
  public:
- 	/* Bot that should log this message */
-	BotInfo *bi;
+	/* Bot that should log this message */
+	BotInfo *bi = nullptr;
 	/* For commands, the user executing the command, but might not always exist */
-	User *u;
+	User *u = nullptr;
 	/* For commands, the account executing the command, but will not always exist */
-	NickCore *nc;
+	NickCore *nc = nullptr;
 	/* For commands, the command being executed */
-	Command *c;
+	Command *c = nullptr;
 	/* For commands, the command source */
-	CommandSource *source;
+	CommandSource *source = nullptr;
 	/* Used for LOG_CHANNEL */
-	Channel *chan;
+	Channel *chan = nullptr;
 	/* For commands, the channel the command was executed on, will not always exist */
-	const ChannelInfo *ci;
+	const ChannelInfo *ci = nullptr;
 	/* For LOG_SERVER */
-	Server *s;
+	Server *s = nullptr;
 	/* For LOG_MODULE */
-	Module *m;
+	Module *m = nullptr;
 	LogType type;
 	Anope::string category;
 
@@ -114,10 +112,10 @@ class CoreExport Log
 class CoreExport LogInfo
 {
  public:
- 	BotInfo *bot;
+	BotInfo *bot = nullptr;
 	std::vector<Anope::string> targets;
 	std::vector<LogFile *> logfiles;
-	int last_day;
+	int last_day = 0;
 	std::vector<Anope::string> sources;
 	int log_age;
 	std::vector<Anope::string> admin;
@@ -141,6 +139,3 @@ class CoreExport LogInfo
 	/* Logs the message l if configured to */
 	void ProcessMessage(const Log *l);
 };
-
-#endif // LOGGER_H
-

include/mail.h

@@ -1,18 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
- *
  */
 
-#ifndef MAIL_H
-#define MAIL_H
+#pragma once
 
 #include "anope.h"
 #include "threadengine.h"
@@ -28,17 +25,18 @@ namespace Mail
 	class Message : public Thread
 	{
 	 private:
-	 	Anope::string sendmail_path;
+		Anope::string sendmail_path;
 		Anope::string send_from;
 		Anope::string mail_to;
 		Anope::string addr;
 		Anope::string subject;
 		Anope::string message;
+		Anope::string content_type;
 		bool dont_quote_addresses;
 
-		bool success;
+		bool success = false;
 	 public:
-	 	/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
+		/** Construct this message. Once constructed call Thread::Start to launch the mail sending.
 		 * @param sf Config->SendFrom
 		 * @param mailto Name of person being mailed (u->nick, nc->display, etc)
 		 * @param addr Destination address to mail
@@ -50,9 +48,7 @@ namespace Mail
 		~Message();
 
 		/* Called from within the thread to actually send the mail */
-		void Run() anope_override;
+		void Run() override;
 	};
 
 } // namespace Mail
-
-#endif // MAIL_H

include/memo.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef MEMO_H
-#define MEMO_H
+#pragma once
 
 #include "anope.h"
 #include "serialize.h"
@@ -19,12 +17,13 @@
 class CoreExport Memo : public Serializable
 {
  public:
- 	bool unread;
+	MemoInfo *mi;
+	bool unread;
 	bool receipt;
- 	Memo();
+	Memo();
 	~Memo();
 
-	void Serialize(Serialize::Data &data) const anope_override;
+	void Serialize(Serialize::Data &data) const override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 
 	Anope::string owner;
@@ -39,7 +38,7 @@ class CoreExport Memo : public Serializable
  */
 struct CoreExport MemoInfo
 {
-	int16_t memomax;
+	int16_t memomax = 0;
 	Serialize::Checker<std::vector<Memo *> > memos;
 	std::vector<Anope::string> ignores;
 
@@ -51,5 +50,3 @@ struct CoreExport MemoInfo
 
 	static MemoInfo *GetMemoInfo(const Anope::string &targ, bool &is_chan);
 };
-
-#endif // MEMO_H

include/messages.h

@@ -1,15 +1,16 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
+#pragma once
+
 #include "protocol.h"
 
 /* Common IRCD messages.
@@ -23,39 +24,39 @@ namespace Message
 	struct CoreExport Away : IRCDMessage
 	{
 		Away(Module *creator, const Anope::string &mname = "AWAY") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Capab : IRCDMessage
 	{
 		Capab(Module *creator, const Anope::string &mname = "CAPAB") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Error : IRCDMessage
 	{
 		Error(Module *creator, const Anope::string &mname = "ERROR") : IRCDMessage(creator, mname, 1) { }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
 
 	struct CoreExport Invite : IRCDMessage
 	{
 		Invite(Module *creator, const Anope::string &mname = "INVITE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Join : IRCDMessage
 	{
 		Join(Module *creator, const Anope::string &mname = "JOIN") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
-	
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
+
 		typedef std::pair<ChannelStatus, User *> SJoinUser;
-	
+
 		/** Handle a SJOIN.
 		 * @param source The source of the SJOIN
 		 * @param chan The channel the users are joining to
@@ -65,111 +66,110 @@ namespace Message
 		 */
 		static void SJoin(MessageSource &source, const Anope::string &chan, time_t ts, const Anope::string &modes, const std::list<SJoinUser> &users);
 	};
-	
+
 	struct CoreExport Kick : IRCDMessage
 	{
 		Kick(Module *creator, const Anope::string &mname = "KICK") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Kill : IRCDMessage
 	{
 		Kill(Module *creator, const Anope::string &mname = "KILL") : IRCDMessage(creator, mname, 2) { }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
 
 	struct CoreExport Mode : IRCDMessage
 	{
 		Mode(Module *creator, const Anope::string &mname = "MODE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport MOTD : IRCDMessage
 	{
 		MOTD(Module *creator, const Anope::string &mname = "MOTD") : IRCDMessage(creator, mname, 1) { }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Notice : IRCDMessage
 	{
 		Notice(Module *creator, const Anope::string &mname = "NOTICE") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
 
 	struct CoreExport Part : IRCDMessage
 	{
 		Part(Module *creator, const Anope::string &mname = "PART") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Ping : IRCDMessage
 	{
 		Ping(Module *creator, const Anope::string &mname = "PING") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Privmsg : IRCDMessage
 	{
 		Privmsg(Module *creator, const Anope::string &mname = "PRIVMSG") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Quit : IRCDMessage
 	{
 		Quit(Module *creator, const Anope::string &mname = "QUIT") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport SQuit : IRCDMessage
 	{
 		SQuit(Module *creator, const Anope::string &mname = "SQUIT") : IRCDMessage(creator, mname, 2) { }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Stats : IRCDMessage
 	{
 		Stats(Module *creator, const Anope::string &mname = "STATS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Time : IRCDMessage
 	{
 		Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Topic : IRCDMessage
 	{
 		Topic(Module *creator, const Anope::string &mname = "TOPIC") : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Version : IRCDMessage
 	{
 		Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
-	
+
 	struct CoreExport Whois : IRCDMessage
 	{
- 		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
-	
-		void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
+		Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+
+		void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override;
 	};
 
 } // namespace Message
-	

include/modes.h

@@ -1,13 +1,12 @@
 /* Mode support
  *
- * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ * (C) 2008-2011 Adam <Adam@anope.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
 
-#ifndef MODES_H
-#define MODES_H
+#pragma once
 
 #include "anope.h"
 #include "base.h"
@@ -39,8 +38,8 @@ enum ModeClass
 class CoreExport Mode : public Base
 {
  public:
- 	/* Mode name */
- 	Anope::string name;
+	/* Mode name */
+	Anope::string name;
 	/* Class of mode this is (user/channel) */
 	ModeClass mclass;
 	/* Mode char for this, eg 'b' */
@@ -55,7 +54,7 @@ class CoreExport Mode : public Base
 	 * @param type The mode type
 	 */
 	Mode(const Anope::string &mname, ModeClass mclass, char mc, ModeType type);
-	virtual ~Mode();
+	virtual ~Mode() = default;
 
 	/** Can a user set this mode, used for mlock
 	 * @param u The user
@@ -78,7 +77,7 @@ class CoreExport UserMode : public Mode
 class CoreExport UserModeParam : public UserMode
 {
  public:
- 	/** constructor
+	/** constructor
 	 * @param name The mode name
 	 * @param mc The mode char
 	 */
@@ -96,7 +95,7 @@ class CoreExport UserModeParam : public UserMode
 class CoreExport ChannelMode : public Mode
 {
  public:
-	/* channel modes that can posssibly unwrap this mode */
+	/* channel modes that can possibly unwrap this mode */
 	std::vector<ChannelMode *> listeners;
 
 	/** constructor
@@ -105,7 +104,7 @@ class CoreExport ChannelMode : public Mode
 	 */
 	ChannelMode(const Anope::string &name, char mc);
 
-	bool CanSet(User *u) const anope_override;
+	bool CanSet(User *u) const override;
 
 	virtual void Check() { }
 
@@ -192,15 +191,15 @@ 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
 	 * @param mc The mode char
-	 * @param msymbol The symbol for the mode, eg @ % 
+	 * @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),
@@ -217,11 +216,11 @@ class CoreExport ChannelModeVirtual : public T
 
 	~ChannelModeVirtual();
 
-	void Check() anope_override;
+	void Check() override;
 
-	ChannelMode *Wrap(Anope::string &param) anope_override;
+	ChannelMode *Wrap(Anope::string &param) override;
 
-	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) = 0;
+	ChannelMode *Unwrap(ChannelMode *cm, Anope::string &param) override = 0;
 };
 
 /* The status a user has on a channel (+v, +h, +o) etc */
@@ -229,9 +228,9 @@ class CoreExport ChannelStatus
 {
 	Anope::string modes;
  public:
- 	ChannelStatus();
- 	ChannelStatus(const Anope::string &modes);
- 	void AddMode(char c);
+	ChannelStatus() = default;
+	ChannelStatus(const Anope::string &modes);
+	void AddMode(char c);
 	void DelMode(char c);
 	bool HasMode(char c) const;
 	bool Empty() const;
@@ -245,7 +244,7 @@ class CoreExport UserModeOperOnly : public UserMode
  public:
 	UserModeOperOnly(const Anope::string &mname, char um) : UserMode(mname, um) { }
 
-	bool CanSet(User *u) const anope_override;
+	bool CanSet(User *u) const override;
 };
 
 class CoreExport UserModeNoone : public UserMode
@@ -253,7 +252,7 @@ class CoreExport UserModeNoone : public UserMode
  public:
 	UserModeNoone(const Anope::string &mname, char um) : UserMode(mname, um) { }
 
-	bool CanSet(User *u) const anope_override;
+	bool CanSet(User *u) const override;
 };
 
 /** Channel mode +k (key)
@@ -263,7 +262,7 @@ class CoreExport ChannelModeKey : public ChannelModeParam
  public:
 	ChannelModeKey(char mc) : ChannelModeParam("KEY", mc) { }
 
-	bool IsValid(Anope::string &value) const anope_override;
+	bool IsValid(Anope::string &value) const override;
 };
 
 /** This class is used for oper only channel modes
@@ -274,7 +273,7 @@ class CoreExport ChannelModeOperOnly : public ChannelMode
 	ChannelModeOperOnly(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
 	/* Opers only */
-	bool CanSet(User *u) const anope_override;
+	bool CanSet(User *u) const override;
 };
 
 /** This class is used for channel modes only servers may set
@@ -284,7 +283,7 @@ class CoreExport ChannelModeNoone : public ChannelMode
  public:
 	ChannelModeNoone(const Anope::string &mname, char mc) : ChannelMode(mname, mc) { }
 
-	bool CanSet(User *u) const anope_override;
+	bool CanSet(User *u) const override;
 };
 
 /** This is the mode manager
@@ -394,12 +393,13 @@ class CoreExport Entry
 	Anope::string name;
 	Anope::string mask;
  public:
-	unsigned short cidr_len;
+	unsigned short cidr_len = 0;
+	int family = 0;
 	Anope::string nick, user, host, real;
 
 	/** Constructor
- 	 * @param mode What mode this host is for, can be empty for unknown/no mode
-	 * @param host A full or poartial nick!ident@host/cidr#real name mask
+	 * @param mode What mode this host is for, can be empty for unknown/no mode
+	 * @param host A full or partial nick!ident@host/cidr#real name mask
 	 */
 	Entry(const Anope::string &mode, const Anope::string &host);
 
@@ -417,5 +417,3 @@ class CoreExport Entry
 	 */
 	bool Matches(User *u, bool full = false) const;
 };
-
-#endif // MODES_H

include/module.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,8 +9,7 @@
  * Based on the original code of Services by Andy Church.
  */
 
-#ifndef MODULE_H
-#define MODULE_H
+#pragma once
 
 #include "access.h"
 #include "account.h"
@@ -50,5 +49,3 @@
 #include "modules/pseudoclients/global.h"
 #include "modules/pseudoclients/memoserv.h"
 #include "modules/pseudoclients/nickserv.h"
-
-#endif // MODULE_H

include/modules.h

@@ -1,20 +1,18 @@
 /* Modular support
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
+
+#pragma once
+
 #include "serialize.h"
-
-#ifndef MODULES_H
-#define MODULES_H
-
 #include "base.h"
 #include "modes.h"
 #include "timers.h"
@@ -26,32 +24,7 @@
  * and functions needed to make a module loadable by the OS.
  * It defines the class factory and external AnopeInit and AnopeFini functions.
  */
-#ifdef _WIN32
-# define MODULE_INIT(x) \
-	extern "C" DllExport Module *AnopeInit(const Anope::string &, const Anope::string &); \
-	extern "C" Module *AnopeInit(const Anope::string &modname, const Anope::string &creator) \
-	{ \
-		return new x(modname, creator); \
-	} \
-	BOOLEAN WINAPI DllMain(HINSTANCE, DWORD, LPVOID) \
-	{ \
-		return TRUE; \
-	} \
-	extern "C" DllExport void AnopeFini(x *); \
-	extern "C" void AnopeFini(x *m) \
-	{ \
-		delete m; \
-	} \
-	extern "C" DllExport ModuleVersionC AnopeVersion() \
-	{ \
-		ModuleVersionC ver; \
-		ver.version_major = VERSION_MAJOR; \
-		ver.version_minor = VERSION_MINOR; \
-		ver.version_patch = VERSION_PATCH; \
-		return ver; \
-	}
-#else
-# define MODULE_INIT(x) \
+#define MODULE_INIT(x) \
 	extern "C" DllExport Module *AnopeInit(const Anope::string &modname, const Anope::string &creator) \
 	{ \
 		return new x(modname, creator); \
@@ -68,12 +41,11 @@
 		ver.version_patch = VERSION_PATCH; \
 		return ver; \
 	}
-#endif
 
 /**
  * This #define allows us to call a method in all
  * loaded modules in a readable simple way, e.g.:
- * 
+ *
  * FOREACH_MOD(OnUserConnect, (user, exempt));
  */
 #define FOREACH_MOD(ename, args) \
@@ -105,7 +77,7 @@ else \
  * This define is similar to the one above but returns a result.
  * The first module to return a result other than EVENT_CONTINUE is the value to be accepted,
  * and any modules after are ignored. This is used like:
- * 
+ *
  * EventReturn MOD_RESULT;
  * FOREACH_RESULT(OnUserConnect, MOD_RESULT, (user, exempt));
  */
@@ -302,6 +274,11 @@ class CoreExport Module : public Extensible
 	 * before they will be called.
 	 */
 
+	/** Called on startup after database load, but before
+	 * connecting to the uplink.
+	 */
+	virtual void OnPostInit() { throw NotImplementedException(); }
+
 	/** Called before a user has been kicked from a channel.
 	 * @param source The kicker
 	 * @param cu The user, channel, and status of the user being kicked
@@ -318,7 +295,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserKicked(const MessageSource &source, User *target, const Anope::string &channel, ChannelStatus &status, const Anope::string &kickmsg) { throw NotImplementedException(); }
 
-	/** Called when Services' configuration is being (re)loaded.
+	/** Called when the configuration is being (re)loaded.
 	 * @param conf The config that is being built now and will replace the global Config object
 	 * @throws A ConfigException to abort the config (re)loading process.
 	 */
@@ -401,7 +378,6 @@ class CoreExport Module : public Extensible
 	 *  see src/encrypt.c for detailed informations
 	 */
 	virtual EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
-	virtual EventReturn OnDecrypt(const Anope::string &hashm, const Anope::string &src, Anope::string &dest) { throw NotImplementedException(); }
 
 	/** Called on fantasy command
 	 * @param source The source of the command
@@ -503,7 +479,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnChanExpire(ChannelInfo *ci) { throw NotImplementedException(); }
 
-	/** Called before Anope connecs to its uplink
+	/** Called before Anope connects to its uplink
 	 */
 	virtual void OnPreServerConnect() { throw NotImplementedException(); }
 
@@ -551,7 +527,7 @@ class CoreExport Module : public Extensible
 
 	/** Called before an exception is deleted
 	 * @param source The source deleting it
-	 * @param ex The exceotion
+	 * @param ex The exception
 	 */
 	virtual void OnExceptionDel(CommandSource &source, Exception *ex) { throw NotImplementedException(); }
 
@@ -772,7 +748,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnNickSuspend(NickAlias *na) { throw NotImplementedException(); }
 
-	/** Called when a nick is unsuspneded
+	/** Called when a nick is unsuspended
 	 * @param na The nick alias
 	 */
 	virtual void OnNickUnsuspended(NickAlias *na) { throw NotImplementedException(); }
@@ -935,12 +911,12 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) { throw NotImplementedException(); }
 
-	/** Called when a channel mode is introducted into Anope
+	/** Called when a channel mode is introduced into Anope
 	 * @param cm The mode
 	 */
 	virtual void OnChannelModeAdd(ChannelMode *cm) { throw NotImplementedException(); }
 
-	/** Called when a user mode is introducted into Anope
+	/** Called when a user mode is introduced into Anope
 	 * @param um The mode
 	 */
 	virtual void OnUserModeAdd(UserMode *um) { throw NotImplementedException(); }
@@ -1016,7 +992,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnLogMessage(LogInfo *li, const Log *l, const Anope::string &msg) { throw NotImplementedException(); }
 
-	/** Called when a DNS request (question) is recieved.
+	/** Called when a DNS request (question) is received.
 	 * @param req The dns request
 	 * @param reply The reply that will be sent
 	 */
@@ -1076,7 +1052,7 @@ class CoreExport Module : public Extensible
 	 */
 	virtual EventReturn OnMessage(MessageSource &source, Anope::string &command, std::vector<Anope::string> &param) { throw NotImplementedException(); }
 
-	/** Called to determine if a chnanel mode can be set by a user
+	/** Called to determine if a channel mode can be set by a user
 	 * @param u The user
 	 * @param cm The mode
 	 */
@@ -1089,17 +1065,25 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnExpireTick() { throw NotImplementedException(); }
 
-	/** Called when a nick is validated. That is, to determine if a user is permissted
+	/** Called when a nick is validated. That is, to determine if a user is permitted
 	 * to be on the given nick.
 	 * @param u The user
 	 * @param na The nick they are on
 	 * @return EVENT_STOP to force the user off of the nick
 	 */
 	virtual EventReturn OnNickValidate(User *u, NickAlias *na) { throw NotImplementedException(); }
+
+	/** Called when a certain user has to be unbanned on a certain channel.
+	 * May be used to send protocol-specific messages.
+	 * @param u The user to be unbanned
+	 * @param c The channel that user has to be unbanned on
+	 */
+	virtual void OnChannelUnban(User *u, ChannelInfo *ci) { throw NotImplementedException(); }
 };
 
 enum Implementation
 {
+	I_OnPostInit,
 	I_OnPreUserKicked, I_OnUserKicked, I_OnReload, I_OnPreBotAssign, I_OnBotAssign, I_OnBotUnAssign, I_OnUserConnect,
 	I_OnNewServer, I_OnUserNickChange, I_OnPreHelp, I_OnPostHelp, I_OnPreCommand, I_OnPostCommand, I_OnSaveDatabase,
 	I_OnLoadDatabase, I_OnEncrypt, I_OnDecrypt, I_OnBotFantasy, I_OnBotNoFantasyAccess, I_OnBotBan, I_OnBadWordAdd,
@@ -1120,7 +1104,7 @@ enum Implementation
 	I_OnPrivmsg, I_OnLog, I_OnLogMessage, I_OnDnsRequest, I_OnCheckModes, I_OnChannelSync, I_OnSetCorrectModes,
 	I_OnSerializeCheck, I_OnSerializableConstruct, I_OnSerializableDestruct, I_OnSerializableUpdate,
 	I_OnSerializeTypeCreate, I_OnSetChannelOption, I_OnSetNickOption, I_OnMessage, I_OnCanSet, I_OnCheckDelete,
-	I_OnExpireTick, I_OnNickValidate,
+	I_OnExpireTick, I_OnNickValidate, I_OnChannelUnban,
 	I_SIZE
 };
 
@@ -1133,7 +1117,7 @@ class CoreExport ModuleManager
 	 */
 	static std::vector<Module *> EventHandlers[I_SIZE];
 
- 	/** List of all modules loaded in Anope
+	/** List of all modules loaded in Anope
 	 */
 	static std::list<Module *> Modules;
 
@@ -1172,7 +1156,7 @@ class CoreExport ModuleManager
 	/** Checks whether this version of Anope is at least major.minor.patch.build
 	 * Throws a ModuleException if not
 	 * @param major The major version
-	 * @param minor The minor vesion
+	 * @param minor The minor version
 	 * @param patch The patch version
 	 */
 	static void RequireVersion(int major, int minor, int patch);
@@ -1223,5 +1207,3 @@ class CoreExport ModuleManager
 	 */
 	static ModuleVersion GetVersion(void *handle);
 };
-
-#endif // MODULES_H

include/modules/bs_badwords.h

@@ -1,16 +1,16 @@
 /* BotServ core functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
- *
  */
 
+#pragma once
+
 /** Flags for badwords
  */
 enum BadWordType
@@ -32,14 +32,14 @@ struct BadWord
 	Anope::string word;
 	BadWordType type;
 
-	virtual ~BadWord() { }
+	virtual ~BadWord() = default;
  protected:
-	BadWord() { }
+	BadWord() = default;
 };
 
 struct BadWords
 {
-	virtual ~BadWords() { }
+	virtual ~BadWords() = default;
 
 	/** Add a badword to the badword list
 	 * @param word The badword
@@ -70,4 +70,3 @@ struct BadWords
 
 	virtual void Check() = 0;
 };
-

include/modules/bs_kick.h

@@ -1,16 +1,16 @@
 /* BotServ core functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
- *
  */
 
+#pragma once
+
 /* Indices for TTB (Times To Ban) */
 enum
 {
@@ -38,9 +38,9 @@ struct KickerData
 	bool dontkickops, dontkickvoices;
 
  protected:
-	KickerData() { }
+	KickerData() = default;
 
  public:
-	virtual ~KickerData() { }
+	virtual ~KickerData() = default;
 	virtual void Check(ChannelInfo *ci) = 0;
 };

include/modules/cs_entrymsg.h

@@ -1,11 +1,13 @@
 /*
- * (C) 2003-2014 Anope Team
+ *
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
+#pragma once
+
 struct EntryMsg
 {
 	Anope::string chan;
@@ -13,9 +15,9 @@ struct EntryMsg
 	Anope::string message;
 	time_t when;
 
-	virtual ~EntryMsg() { }
+	virtual ~EntryMsg() = default;
  protected:
-	EntryMsg() { }
+	EntryMsg() = default;
 };
 
 struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
@@ -32,4 +34,3 @@ struct EntryMessageList : Serialize::Checker<std::vector<EntryMsg *> >
 
 	virtual EntryMsg* Create() = 0;
 };
-

include/modules/cs_log.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,6 +9,8 @@
  * Based on the original code of Services by Andy Church.
  */
 
+#pragma once
+
 struct LogSetting
 {
 	Anope::string chan;
@@ -22,9 +24,9 @@ struct LogSetting
 	Anope::string creator;
 	time_t created;
 
-	virtual ~LogSetting() { }
+	virtual ~LogSetting() = default;
  protected:
-	LogSetting() { }
+	LogSetting() = default;
 };
 
 struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
@@ -37,7 +39,6 @@ struct LogSettings : Serialize::Checker<std::vector<LogSetting *> >
 	}
 
  public:
- 	virtual ~LogSettings() { }
+	virtual ~LogSettings() = default;
 	virtual LogSetting *Create() = 0;
 };
-

include/modules/cs_mode.h

@@ -1,6 +1,6 @@
 /* ChanServ core functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,6 +9,8 @@
  * Based on the original code of Services by Andy Church.
  */
 
+#pragma once
+
 struct ModeLock
 {
 	Anope::string ci;
@@ -18,16 +20,16 @@ struct ModeLock
 	Anope::string setter;
 	time_t created;
 
-	virtual ~ModeLock() { }
+	virtual ~ModeLock() = default;
  protected:
-	ModeLock() { }
+	ModeLock() = default;
 };
 
 struct ModeLocks
 {
 	typedef std::vector<ModeLock *> ModeList;
 
-	virtual ~ModeLocks() { }
+	virtual ~ModeLocks() = default;
 
 	/** Check if a mode is mlocked
 	 * @param mode The mode
@@ -74,17 +76,16 @@ struct ModeLocks
 
 	/** Get details for a specific mlock
 	 * @param mname The mode name
- 	 * @param An optional param to match with
+	 * @param An optional param to match with
 	 * @return The MLock, if any
 	 */
 	virtual const ModeLock *GetMLock(const Anope::string &mname, const Anope::string &param = "") = 0;
 
 	/** Get the current mode locks as a string
-	 * @param complete True to show mlock parameters aswell
+	 * @param complete True to show mlock parameters as well
 	 * @return A string of mode locks, eg: +nrt
 	 */
 	virtual Anope::string GetMLockAsString(bool complete) const = 0;
 
 	virtual void Check() = 0;
 };
-

include/modules/dns.h

@@ -1,17 +1,15 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
-	
-#ifndef DNS_H
-#define DNS_H
+
+#pragma once
 
 namespace DNS
 {
@@ -53,7 +51,7 @@ namespace DNS
 		QUERYFLAGS_Z = 0x70,
 		QUERYFLAGS_RCODE = 0xF
 	};
-	
+
 	enum Error
 	{
 		ERROR_NONE,
@@ -70,42 +68,42 @@ namespace DNS
 		ERROR_NO_RECORDS,
 		ERROR_INVALIDTYPE
 	};
-	
+
 	struct Question
 	{
 		Anope::string name;
-		QueryType type;
-		unsigned short qclass;
-	
-		Question() : type(QUERY_NONE), qclass(0) { }
+		QueryType type = QUERY_NONE;
+		unsigned short qclass = 0;
+
+		Question() = default;
 		Question(const Anope::string &n, QueryType t, unsigned short c = 1) : name(n), type(t), qclass(c) { }
-		inline bool operator==(const Question & other) const { return name == other.name && type == other.type && qclass == other.qclass; } 
+		inline bool operator==(const Question & other) const { return name == other.name && type == other.type && qclass == other.qclass; }
 
 		struct hash
 		{
-			size_t operator()(const Question &q) const 
+			size_t operator()(const Question &q) const
 			{
 				return Anope::hash_ci()(q.name);
 			}
 		};
 	};
-	
+
 	struct ResourceRecord : Question
 	{
-		unsigned int ttl;
+		unsigned int ttl = 0;
 		Anope::string rdata;
 		time_t created;
-	
-		ResourceRecord(const Anope::string &n, QueryType t, unsigned short c = 1) : Question(n, t, c), ttl(0), created(Anope::CurTime) { }
-		ResourceRecord(const Question &q) : Question(q), ttl(0), created(Anope::CurTime) { }
+
+		ResourceRecord(const Anope::string &n, QueryType t, unsigned short c = 1) : Question(n, t, c), created(Anope::CurTime) { }
+		ResourceRecord(const Question &q) : Question(q), created(Anope::CurTime) { }
 	};
-	
+
 	struct Query
 	{
 		std::vector<Question> questions;
 		std::vector<ResourceRecord> answers, authorities, additional;
 		Error error;
-	
+
 		Query() : error(ERROR_NONE) { }
 		Query(const Question &q) : error(ERROR_NONE) { questions.push_back(q); }
 	};
@@ -119,18 +117,18 @@ namespace DNS
 	{
 	 public:
 		Manager(Module *creator) : Service(creator, "DNS::Manager", "dns/manager") { }
-		virtual ~Manager() { }
+		virtual ~Manager() = default;
 
 		virtual void Process(Request *req) = 0;
 		virtual void RemoveRequest(Request *req) = 0;
-	
+
 		virtual bool HandlePacket(ReplySocket *s, const unsigned char *const data, int len, sockaddrs *from) = 0;
-	
+
 		virtual void UpdateSerial() = 0;
 		virtual void Notify(const Anope::string &zone) = 0;
 		virtual uint32_t GetSerial() const = 0;
 	};
-	
+
 	/** A DNS query.
 	 */
 	class Request : public Timer, public Question
@@ -140,32 +138,32 @@ namespace DNS
 		/* Use result cache if available */
 		bool use_cache;
 		/* Request id */
-	 	unsigned short id;
-	 	/* Creator of this request */
+		unsigned short id = 0;
+		/* Creator of this request */
 		Module *creator;
 
 		Request(Manager *mgr, Module *c, const Anope::string &addr, QueryType qt, bool cache = false) : Timer(0), Question(addr, qt), manager(mgr),
-			use_cache(cache), id(0), creator(c) { }
-		
+			use_cache(cache), creator(c) { }
+
 		virtual ~Request()
 		{
 			manager->RemoveRequest(this);
 		}
-	
+
 		/** Called when this request succeeds
 		 * @param r The query sent back from the nameserver
 		 */
 		virtual void OnLookupComplete(const Query *r) = 0;
-	
+
 		/** Called when this request fails or times out.
 		 * @param r The query sent back from the nameserver, check the error code.
 		 */
 		virtual void OnError(const Query *r) { }
-		
+
 		/** Used to time out the query, xalls OnError and lets the TimerManager
 		 * delete this request.
 		 */
-		void Tick(time_t) anope_override
+		void Tick(time_t) override
 		{
 			Log(LOG_DEBUG_2) << "Resolver: timeout for query " << this->name;
 			Query rr(*this);
@@ -173,9 +171,5 @@ namespace DNS
 			this->OnError(&rr);
 		}
 	};
-	
+
 } // namespace DNS
-	
-#endif // DNS_H
-	
-	

include/modules/encryption.h

@@ -1,15 +1,16 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
+#pragma once
+
 namespace Encryption
 {
 	typedef std::pair<const unsigned char *, size_t> Hash;
@@ -18,7 +19,7 @@ namespace Encryption
 	class Context
 	{
 	 public:
-	 	virtual ~Context() { }
+		virtual ~Context() = default;
 		virtual void Update(const unsigned char *data, size_t len) = 0;
 		virtual void Finalize() = 0;
 		virtual Hash GetFinalizedHash() = 0;
@@ -28,10 +29,9 @@ namespace Encryption
 	{
 	 public:
 		Provider(Module *creator, const Anope::string &sname) : Service(creator, "Encryption::Provider", sname) { }
-		virtual ~Provider() { }
+		virtual ~Provider() = default;
 
 		virtual Context *CreateContext(IV * = NULL) = 0;
 		virtual IV GetDefaultIV() = 0;
 	};
 }
-

include/modules/httpd.h

@@ -1,5 +1,12 @@
-#ifndef ANOPE_HTTPD_H
-#define ANOPE_HTTPD_H
+/*
+ *
+ * (C) 2012-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 enum HTTPError
 {
@@ -13,13 +20,14 @@ enum HTTPError
 /* A message to someone */
 struct HTTPReply
 {
-	HTTPError error;
+	HTTPError error = HTTP_ERROR_OK;
 	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;
 
-	HTTPReply() : error(HTTP_ERROR_OK), length(0) { }
+	HTTPReply() = default;
+	HTTPReply& operator=(const HTTPReply &) = default;
 
 	HTTPReply(const HTTPReply& other) : error(other.error), length(other.length)
 	{
@@ -27,14 +35,14 @@ struct HTTPReply
 		headers = other.headers;
 		cookies = other.cookies;
 
-		for (unsigned i = 0; i < other.out.size(); ++i)
-			out.push_back(new Data(other.out[i]->buf, other.out[i]->len));
+		for (const auto &datum : other.out)
+			out.push_back(new Data(datum->buf, datum->len));
 	}
 
 	~HTTPReply()
 	{
-		for (unsigned i = 0; i < out.size(); ++i)
-			delete out[i];
+		for (const auto *datum : out)
+			delete datum;
 		out.clear();
 	}
 
@@ -57,7 +65,7 @@ struct HTTPReply
 	};
 
 	std::deque<Data *> out;
-	size_t length;
+	size_t length = 0;
 
 	void Write(const Anope::string &message)
 	{
@@ -72,7 +80,7 @@ struct HTTPReply
 	}
 };
 
-/* A message from soneone */
+/* A message from someone */
 struct HTTPMessage
 {
 	std::map<Anope::string, Anope::string> headers;
@@ -85,13 +93,13 @@ struct HTTPMessage
 class HTTPClient;
 class HTTPProvider;
 
-class HTTPPage : public Base
+class HTTPPage : public virtual Base
 {
 	Anope::string url;
 	Anope::string content_type;
 
  public:
- 	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
+	HTTPPage(const Anope::string &u, const Anope::string &ct = "text/html") : url(u), content_type(ct) { }
 
 	const Anope::string &GetURL() const { return this->url; }
 
@@ -129,11 +137,11 @@ class HTTPClient : public ClientSocket, public BinarySocket, public Base
 
 class HTTPProvider : public ListenSocket, public Service
 {
- 	Anope::string ip;
+	Anope::string ip;
 	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) { }
@@ -188,10 +196,8 @@ namespace HTTPUtils
 	{
 		Anope::string encoded;
 
-		for (unsigned i = 0; i < url.length(); ++i)
+		for (const auto c : url)
 		{
-			const char& c = url[i];
-
 			if (isalnum(c) || c == '.' || c == '-' || c == '*' || c == '_')
 				encoded += c;
 			else if (c == ' ')
@@ -207,9 +213,9 @@ namespace HTTPUtils
 	{
 		Anope::string dst;
 
-		for (unsigned i = 0; i < src.length(); ++i)
+		for (const auto c : src)
 		{
-			switch (src[i])
+			switch (c)
 			{
 				case '<':
 					dst += "&lt;";
@@ -220,13 +226,14 @@ namespace HTTPUtils
 				case '"':
 					dst += "&quot;";
 					break;
+				case '&':
+					dst += "&amp;";
+					break;
 				default:
-					dst += src[i];
+					dst += c;
 			}
 		}
 
 		return dst;
 	}
 }
-
-#endif // ANOPE_HTTPD_H

include/modules/ldap.h

@@ -1,12 +1,19 @@
-#ifndef ANOPE_LDAP_H
-#define ANOPE_LDAP_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 class LDAPException : public ModuleException
 {
  public:
 	LDAPException(const Anope::string &reason) : ModuleException(reason) { }
 
-	virtual ~LDAPException() throw() { }
+	virtual ~LDAPException() noexcept = default;
 };
 
 struct LDAPModification
@@ -35,8 +42,8 @@ struct LDAPAttributes : public std::map<Anope::string, std::vector<Anope::string
 	const std::vector<Anope::string> keys() const
 	{
 		std::vector<Anope::string> k;
-		for (const_iterator it = this->begin(), it_end = this->end(); it != it_end; ++it)
-			k.push_back(it->first);
+		for (const auto &[key, _] : *this)
+			k.push_back(key);
 		return k;
 	}
 
@@ -108,7 +115,7 @@ class LDAPInterface
 	Module *owner;
 
 	LDAPInterface(Module *m) : owner(m) { }
-	virtual ~LDAPInterface() { }
+	virtual ~LDAPInterface() = default;
 
 	virtual void OnResult(const LDAPResult &r) = 0;
 	virtual void OnError(const LDAPResult &err) = 0;
@@ -159,5 +166,3 @@ class LDAPProvider : public Service
 	 */
 	virtual void Modify(LDAPInterface *i, const Anope::string &base, LDAPMods &attributes) = 0;
 };
-
-#endif // ANOPE_LDAP_H

include/modules/ns_cert.h

@@ -1,6 +1,6 @@
 /* NickServ core functions
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,12 +9,14 @@
  * Based on the original code of Services by Andy Church.
  */
 
+#pragma once
+
 struct NSCertList
 {
  protected:
-	NSCertList() { }
+	NSCertList() = default;
  public:
-	virtual ~NSCertList() { }
+	virtual ~NSCertList() = default;
 
 	/** Add an entry to the nick's certificate list
 	 *
@@ -26,7 +28,7 @@ struct NSCertList
 
 	/** Get an entry from the nick's cert list by index
 	 *
-	 * @param entry Index in the certificaate list vector to retrieve
+	 * @param entry Index in the certificate list vector to retrieve
 	 * @return The fingerprint entry of the given index if within bounds, an empty string if the vector is empty or the index is out of bounds
 	 *
 	 * Retrieves an entry from the certificate list corresponding to the given index.
@@ -68,4 +70,3 @@ class CertService : public Service
 
 	virtual NickCore* FindAccountFromCert(const Anope::string &cert) = 0;
 };
-

include/modules/os_forbid.h

@@ -1,5 +1,12 @@
-#ifndef OS_FORBID_H
-#define OS_FORBID_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 enum ForbidType
 {
@@ -15,13 +22,13 @@ struct ForbidData
 	Anope::string mask;
 	Anope::string creator;
 	Anope::string reason;
-	time_t created;
-	time_t expires;
+	time_t created = 0;
+	time_t expires = 0;
 	ForbidType type;
 
-	virtual ~ForbidData() { }
+	virtual ~ForbidData() = default;
  protected:
-	ForbidData() : created(0), expires(0) { }
+	ForbidData() = default;
 };
 
 class ForbidService : public Service
@@ -37,10 +44,9 @@ class ForbidService : public Service
 
 	virtual ForbidData *FindForbid(const Anope::string &mask, ForbidType type) = 0;
 
+	virtual ForbidData *FindForbidExact(const Anope::string &mask, ForbidType type) = 0;
+
 	virtual std::vector<ForbidData *> GetForbids() = 0;
 };
 
 static ServiceReference<ForbidService> forbid_service("ForbidService", "forbid");
-
-#endif
-

include/modules/os_ignore.h

@@ -1,6 +1,6 @@
 /* OperServ ignore interface
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,24 +9,25 @@
  * Based on the original code of Services by Andy Church.
  */
 
+#pragma once
 
 struct IgnoreData
 {
 	Anope::string mask;
 	Anope::string creator;
 	Anope::string reason;
-	time_t time; /* When do we stop ignoring them? */
+	time_t time = 0; /* When do we stop ignoring them? */
 
-	virtual ~IgnoreData() { }
+	virtual ~IgnoreData() = default;
  protected:
-	IgnoreData() : time(0) { }
+	IgnoreData() = default;
 };
 
 class IgnoreService : public Service
 {
  protected:
 	IgnoreService(Module *c) : Service(c, "IgnoreService", "ignore") { }
-	
+
  public:
 	virtual void AddIgnore(IgnoreData *) = 0;
 
@@ -42,4 +43,3 @@ class IgnoreService : public Service
 };
 
 static ServiceReference<IgnoreService> ignore_service("IgnoreService", "ignore");
-

include/modules/os_news.h

@@ -1,5 +1,12 @@
-#ifndef OS_NEWS
-#define OS_NEWS
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 enum NewsType
 {
@@ -31,15 +38,12 @@ class NewsService : public Service
 	NewsService(Module *m) : Service(m, "NewsService", "news") { }
 
 	virtual NewsItem *CreateNewsItem() = 0;
-	
+
 	virtual void AddNewsItem(NewsItem *n) = 0;
-	
+
 	virtual void DelNewsItem(NewsItem *n) = 0;
-	
+
 	virtual std::vector<NewsItem *> &GetNewsList(NewsType t) = 0;
 };
 
 static ServiceReference<NewsService> news_service("NewsService", "news");
-
-#endif // OS_NEWS
-

include/modules/os_session.h

@@ -1,13 +1,20 @@
-#ifndef OS_SESSION_H
-#define OS_SESSION_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 struct Session
 {
 	cidr addr;                      /* A cidr (sockaddrs + len) representing this session */
-	unsigned count;                 /* Number of clients with this host */
-	unsigned hits;                  /* Number of subsequent kills for a host */
+	unsigned count = 1;             /* Number of clients with this host */
+	unsigned hits = 0;              /* Number of subsequent kills for a host */
 
-	Session(const sockaddrs &ip, int len) : addr(ip, len), count(1), hits(0) { }
+	Session(const sockaddrs &ip, int len) : addr(ip, len) { }
 };
 
 struct Exception : Serializable
@@ -20,14 +27,14 @@ struct Exception : Serializable
 	time_t expires;			/* Time when it expires. 0 == no expiry */
 
 	Exception() : Serializable("Exception") { }
-	void Serialize(Serialize::Data &data) const anope_override;
+	void Serialize(Serialize::Data &data) const override;
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
 class SessionService : public Service
 {
  public:
- 	typedef TR1NS::unordered_map<cidr, Session *, cidr::hash> SessionMap;
+	typedef std::unordered_map<cidr, Session *, cidr::hash> SessionMap;
 	typedef std::vector<Exception *> ExceptionVector;
 
 	SessionService(Module *m) : Service(m, "SessionService", "session") { }
@@ -40,7 +47,7 @@ class SessionService : public Service
 
 	virtual Exception *FindException(User *u) = 0;
 
-	virtual Exception *FindException(const Anope::string &host) = 0; 
+	virtual Exception *FindException(const Anope::string &host) = 0;
 
 	virtual ExceptionVector &GetExceptions() = 0;
 
@@ -82,6 +89,3 @@ Serializable* Exception::Unserialize(Serializable *obj, Serialize::Data &data)
 		session_service->AddException(ex);
 	return ex;
 }
-
-#endif
-

include/modules/pseudoclients/chanserv.h

@@ -1,5 +1,12 @@
-#ifndef CHANSERV_H
-#define CHANSERV_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 class ChanServService : public Service
 {
@@ -13,6 +20,3 @@ class ChanServService : public Service
 	 */
 	virtual void Hold(Channel *c) = 0;
 };
-
-#endif // CHANSERV_H
-

include/modules/pseudoclients/global.h

@@ -1,5 +1,12 @@
-#ifndef GLOBAL_H
-#define GLOBAL_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 class GlobalService : public Service
 {
@@ -8,6 +15,9 @@ class GlobalService : public Service
 	{
 	}
 
+	/** Retrieves the bot which sends global messages unless otherwise specified. */
+	virtual Reference<BotInfo> GetDefaultSender() = 0;
+
 	/** Send out a global message to all users
 	 * @param sender Our client which should send the global
 	 * @param source The sender of the global
@@ -15,6 +25,3 @@ class GlobalService : public Service
 	 */
 	virtual void SendGlobal(BotInfo *sender, const Anope::string &source, const Anope::string &message) = 0;
 };
-
-#endif // GLOBAL_H
-

include/modules/pseudoclients/memoserv.h

@@ -1,5 +1,12 @@
-#ifndef MEMOSERV_H
-#define MEMOSERV_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 class MemoServService : public Service
 {
@@ -17,7 +24,7 @@ class MemoServService : public Service
 	}
 
 	/** Sends a memo.
-	 * @param source The source of the memo, can be anythin.
+	 * @param source The source of the memo, can be anything.
 	 * @param target The target of the memo, nick or channel.
 	 * @param message Memo text
 	 * @param force true to force the memo, restrictions/delays etc are not checked
@@ -29,6 +36,3 @@ class MemoServService : public Service
 	 */
 	virtual void Check(User *u) = 0;
 };
-
-#endif // MEMOSERV_H
-

include/modules/pseudoclients/nickserv.h

@@ -1,5 +1,12 @@
-#ifndef NICKSERV_H
-#define NICKSERV_H
+/*
+ *
+ * (C) 2011-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 class NickServService : public Service
 {
@@ -12,6 +19,3 @@ class NickServService : public Service
 	virtual void Collide(User *u, NickAlias *na) = 0;
 	virtual void Release(NickAlias *na) = 0;
 };
-
-#endif // NICKSERV_H
-

include/modules/redis.h

@@ -1,12 +1,13 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
- *
  */
 
+#pragma once
+
 namespace Redis
 {
 	struct Reply
@@ -24,15 +25,15 @@ namespace Redis
 
 		Reply() { Clear(); }
 		~Reply() { Clear(); }
-		
+
 		void Clear()
 		{
 			type = NOT_PARSED;
 			i = 0;
 			bulk.clear();
 			multi_bulk_size = 0;
-			for (unsigned j = 0; j < multi_bulk.size(); ++j)
-				delete multi_bulk[j];
+			for (const auto *reply : multi_bulk)
+				delete reply;
 			multi_bulk.clear();
 		}
 
@@ -48,7 +49,7 @@ namespace Redis
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
-		virtual ~Interface() { }
+		virtual ~Interface() = default;
 
 		virtual void OnResult(const Reply &r) = 0;
 		virtual void OnError(const Anope::string &error) { Log(owner) << error; }
@@ -59,6 +60,8 @@ namespace Redis
 	 public:
 		Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }
 
+		virtual bool IsSocketDead() = 0;
+
 		virtual void SendCommand(Interface *i, const std::vector<Anope::string> &cmds) = 0;
 		virtual void SendCommand(Interface *i, const Anope::string &str) = 0;
 
@@ -71,4 +74,3 @@ namespace Redis
 		virtual void CommitTransaction() = 0;
 	};
 }
-

include/modules/sasl.h

@@ -1,11 +1,13 @@
 /*
  *
- * (C) 2014 Anope Team
+ * (C) 2014-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
 
+#pragma once
+
 namespace SASL
 {
 	struct Message
@@ -46,6 +48,7 @@ namespace SASL
 	{
 		time_t created;
 		Anope::string uid;
+		Anope::string hostname, ip;
 		Reference<Mechanism> mech;
 
 		Session(Mechanism *m, const Anope::string &u) : created(Anope::CurTime), uid(u), mech(m) { }
@@ -76,29 +79,38 @@ namespace SASL
 	class IdentifyRequest : public ::IdentifyRequest
 	{
 		Anope::string uid;
+		Anope::string hostname, ip;
 
 	 public:
-		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass) : ::IdentifyRequest(m, acc, pass), uid(id) { }
+		IdentifyRequest(Module *m, const Anope::string &id, const Anope::string &acc, const Anope::string &pass, const Anope::string &h, const Anope::string &i) : ::IdentifyRequest(m, acc, pass), uid(id), hostname(h), ip(i) { }
 
-		void OnSuccess() anope_override
+		void OnSuccess() override
 		{
 			if (!sasl)
 				return;
 
 			NickAlias *na = NickAlias::Find(GetAccount());
-			if (!na || na->nc->HasExt("NS_SUSPENDED"))
+			if (!na || na->nc->HasExt("NS_SUSPENDED") || na->nc->HasExt("UNCONFIRMED"))
+				return OnFail();
+
+			unsigned int maxlogins = Config->GetModule("ns_identify")->Get<unsigned int>("maxlogins");
+			if (maxlogins && na->nc->users.size() >= maxlogins)
 				return OnFail();
 
 			Session *s = sasl->GetSession(uid);
 			if (s)
 			{
-				Log(Config->GetClient("NickServ")) << "A user identified to account " << this->GetAccount() << " using SASL";
+				Anope::string user = "A user";
+				if (!hostname.empty() && !ip.empty())
+					user = hostname + " (" + ip + ")";
+
+				Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " identified to account " << this->GetAccount() << " using SASL";
 				sasl->Succeed(s, na->nc);
 				delete s;
 			}
 		}
 
-		void OnFail() anope_override
+		void OnFail() override
 		{
 			if (!sasl)
 				return;
@@ -116,8 +128,14 @@ namespace SASL
 				accountstatus = "nonexistent ";
 			else if (na->nc->HasExt("NS_SUSPENDED"))
 				accountstatus = "suspended ";
+			else if (na->nc->HasExt("UNCONFIRMED"))
+				accountstatus = "unconfirmed ";
 
-			Log(Config->GetClient("NickServ")) << "A user failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
+			Anope::string user = "A user";
+			if (!hostname.empty() && !ip.empty())
+				user = hostname + " (" + ip + ")";
+
+			Log(this->GetOwner(), "sasl", Config->GetClient("NickServ")) << user << " failed to identify for " << accountstatus << "account " << this->GetAccount() << " using SASL";
 		}
 	};
 }

include/modules/set_misc.h

@@ -1,17 +1,20 @@
 /*
- * (C) 2003-2014 Anope Team
+ *
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
 
+#pragma once
+
 struct MiscData
 {
 	Anope::string object;
 	Anope::string name;
 	Anope::string data;
 
-	MiscData() { }
-	virtual ~MiscData() { }
+	virtual ~MiscData() = default;
+ protected:
+	MiscData() = default;
 };
-

include/modules/sql.h

@@ -1,17 +1,20 @@
 /*
- * (C) 2003-2014 Anope Team
+ *
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
 
+#pragma once
+
 namespace SQL
 {
 
 	class Data : public Serialize::Data
 	{
 	 public:
- 		typedef std::map<Anope::string, std::stringstream *> Map;
+		typedef std::map<Anope::string, std::stringstream *> Map;
 		Map data;
 		std::map<Anope::string, Type> types;
 
@@ -20,7 +23,7 @@ namespace SQL
 			Clear();
 		}
 
-		std::iostream& operator[](const Anope::string &key) anope_override
+		std::iostream& operator[](const Anope::string &key) override
 		{
 			std::stringstream *&ss = data[key];
 			if (!ss)
@@ -28,44 +31,46 @@ namespace SQL
 			return *ss;
 		}
 
-		std::set<Anope::string> KeySet() const anope_override
+		std::set<Anope::string> KeySet() const override
 		{
 			std::set<Anope::string> keys;
-			for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it)
-				keys.insert(it->first);
+			for (const auto &[key, _] : this->data)
+				keys.insert(key);
 			return keys;
 		}
 
-		size_t Hash() const anope_override
+		size_t Hash() const override
 		{
 			size_t hash = 0;
-			for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it)
-				if (!it->second->str().empty())
-					hash ^= Anope::hash_cs()(it->second->str());
+			for (const auto &[_, value] : this->data)
+			{
+				if (!value->str().empty())
+					hash ^= Anope::hash_cs()(value->str());
+			}
 			return hash;
 		}
 
 		std::map<Anope::string, std::iostream *> GetData() const
 		{
 			std::map<Anope::string, std::iostream *> d;
-			for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it)
-				d[it->first] = it->second;
+			for (const auto &[key, value] : this->data)
+				d[key] = value;
 			return d;
 		}
 
 		void Clear()
 		{
-			for (Map::const_iterator it = this->data.begin(), it_end = this->data.end(); it != it_end; ++it)
-				delete it->second;
+			for (const auto &[_, value] : this->data)
+				delete value;
 			this->data.clear();
 		}
 
-		void SetType(const Anope::string &key, Type t) anope_override
+		void SetType(const Anope::string &key, Type t) override
 		{
 			this->types[key] = t;
 		}
 
-		Type GetType(const Anope::string &key) const anope_override
+		Type GetType(const Anope::string &key) const override
 		{
 			std::map<Anope::string, Type>::const_iterator it = this->types.find(key);
 			if (it != this->types.end())
@@ -81,7 +86,7 @@ namespace SQL
 	 public:
 		Exception(const Anope::string &reason) : ModuleException(reason) { }
 
-		virtual ~Exception() throw() { }
+		virtual ~Exception() noexcept = default;
 	};
 
 	/** A SQL query
@@ -140,15 +145,15 @@ namespace SQL
 		Query query;
 		Anope::string error;
 	 public:
-		unsigned int id;
- 		Anope::string finished_query;
+		unsigned int id = 0;
+		Anope::string finished_query;
 
-		Result() : id(0) { }
+		Result() = default;
 		Result(unsigned int i, const Query &q, const Anope::string &fq, const Anope::string &err = "") : query(q), error(err), id(i), finished_query(fq) { }
 
 		inline operator bool() const { return this->error.empty(); }
 
-		inline const unsigned int GetID() const { return this->id; }
+		inline unsigned int GetID() const { return this->id; }
 		inline const Query &GetQuery() const { return this->query; }
 		inline const Anope::string &GetError() const { return this->error; }
 
@@ -186,7 +191,7 @@ namespace SQL
 		Module *owner;
 
 		Interface(Module *m) : owner(m) { }
-		virtual ~Interface() { }
+		virtual ~Interface() = default;
 
 		virtual void OnResult(const Result &r) = 0;
 		virtual void OnError(const Result &r) = 0;
@@ -213,4 +218,3 @@ namespace SQL
 	};
 
 }
-

include/modules/ssl.h

@@ -1,9 +1,17 @@
+/*
+ *
+ * (C) 2010-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
 
 class SSLService : public Service
 {
  public:
 	SSLService(Module *o, const Anope::string &n) : Service(o, "SSLService", n) { }
-	
+
 	virtual void Init(Socket *s) = 0;
 };
-

include/modules/suspend.h

@@ -1,5 +1,6 @@
 /*
- * (C) 2003-2014 Anope Team
+ *
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -8,11 +9,13 @@
  * Based on the original code of Services by Andy Church.
  */
 
+#pragma once
+
 struct SuspendInfo
 {
 	Anope::string what, by, reason;
 	time_t when, expires;
 
-	SuspendInfo() { }
-	virtual ~SuspendInfo() { }
+	SuspendInfo() = default;
+	virtual ~SuspendInfo() = default;
 };

include/modules/xmlrpc.h

@@ -1,3 +1,13 @@
+/*
+ *
+ * (C) 2010-2023 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
+
 #include "httpd.h"
 
 class XMLRPCRequest
@@ -9,9 +19,9 @@ class XMLRPCRequest
 	Anope::string id;
 	std::deque<Anope::string> data;
 	HTTPReply& r;
-	
+
 	XMLRPCRequest(HTTPReply &_r) : r(_r) { }
-	inline void reply(const Anope::string &dname, const Anope::string &ddata) { this->replies.insert(std::make_pair(dname, ddata)); }
+	inline void reply(const Anope::string &dname, const Anope::string &ddata) { this->replies.emplace(dname, ddata); }
 	inline const std::map<Anope::string, Anope::string> &get_replies() { return this->replies; }
 };
 
@@ -20,7 +30,7 @@ class XMLRPCServiceInterface;
 class XMLRPCEvent
 {
  public:
- 	virtual ~XMLRPCEvent() { }
+	virtual ~XMLRPCEvent() = default;
 	virtual bool Run(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request) = 0;
 };
 
@@ -37,4 +47,3 @@ class XMLRPCServiceInterface : public Service
 
 	virtual void Reply(XMLRPCRequest &request) = 0;
 };
-

include/opertype.h

@@ -1,13 +1,12 @@
 /*
- * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2014 Anope Team <team@anope.org>
+ *
+ * (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
+ * (C) 2008-2023 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
- *
  */
 
-#ifndef OPERTYPE_H
-#define OPERTYPE_H
+#pragma once
 
 #include "services.h"
 #include "account.h"
@@ -22,7 +21,7 @@ struct CoreExport Oper
 	/* The type of operator this operator is */
 	OperType *ot;
 	/* Whether the user must be an IRC operator (umode +o) to be considered a services operator */
-	bool require_oper;
+	bool require_oper = true;
 	Anope::string password;
 	Anope::string certfp;
 	/* Hosts allowed to use this operator block */
@@ -33,7 +32,7 @@ struct CoreExport Oper
 	virtual ~Oper();
 
 	static std::vector<Oper *> opers;
-	
+
 	/** Find an oper block by name
 	 * @param name The name
 	 * @return the oper block
@@ -67,7 +66,7 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
  public:
- 	/** Modes to set when someone identifys using this opertype
+	/** Modes to set when someone identifies using this opertype
 	 */
 	Anope::string modes;
 
@@ -123,5 +122,3 @@ class CoreExport OperType
 	 */
 	const std::list<Anope::string> GetPrivs() const;
 };
-
-#endif // OPERTYPE_H

include/protocol.h

@@ -1,29 +1,28 @@
 /*
  *
- * (C) 2003-2014 Anope Team
+ * (C) 2003-2023 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
  * Based on the original code of Services by Andy Church.
- *
  */
 
-#ifndef PROTOCOL_H
-#define PROTOCOL_H
+#pragma once
 
 #include "services.h"
 #include "anope.h"
 #include "service.h"
+#include "modes.h"
 
-/* Encapsultes the IRCd protocol we are speaking. */
+/* Encapsulates the IRCd protocol we are speaking. */
 class CoreExport IRCDProto : public Service
 {
 	Anope::string proto_name;
 
  protected:
- 	IRCDProto(Module *creator, const Anope::string &proto_name);
+	IRCDProto(Module *creator, const Anope::string &proto_name);
  public:
 	virtual ~IRCDProto();
 
@@ -40,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 */
@@ -55,16 +54,18 @@ class CoreExport IRCDProto : public Service
 	bool CanSNLine;
 	/* Can we ban specific nicknames from being used? */
 	bool CanSQLine;
-	/* Can we ban sepcific channel names from being used? */
+	/* Can we ban specific channel names from being used? */
 	bool CanSQLineChannel;
 	/* Can we ban by IP? */
 	bool CanSZLine;
 	/* Can we place temporary holds on specific nicknames? */
 	bool CanSVSHold;
-	/* See os_oline */
-	bool CanSVSO;
 	/* See ns_cert */
 	bool CanCertFP;
+	/* Can we send arbitrary message tags? */
+	bool CanSendTags;
+	/* Can users log out before being fully connected? */
+	bool CanSVSLogout;
 	/* Whether this IRCd requires unique IDs for each user or server. See TS6/P10. */
 	bool RequiresID;
 	/* If this IRCd has unique ids, whether the IDs and nicknames are ambiguous */
@@ -180,10 +181,6 @@ class CoreExport IRCDProto : public Service
 	virtual void SendInvite(const MessageSource &source, const Channel *c, User *u);
 	virtual void SendGlobops(const MessageSource &source, const char *fmt, ...);
 
-	/** Sets oper flags on a user, currently only supported by Unreal
-	 */
-	virtual void SendSVSO(BotInfo *, const Anope::string &, const Anope::string &) { }
-
 	/** Sends a nick change of one of our clients.
 	 */
 	virtual void SendNickChange(User *u, const Anope::string &newnick);
@@ -196,9 +193,9 @@ class CoreExport IRCDProto : public Service
 	 * initial handshake requirements.
 	 */
 	virtual void SendConnect() = 0;
-	
-	/** Called right before we begin our burst, after we have handshaked successfully with the uplink/
-	 * At this point none of our servesr, users, or channels exist on the uplink
+
+	/** Called right before we begin our burst, after we have handshaked successfully with the uplink.
+	 * At this point none of our servers, users, or channels exist on the uplink
 	 */
 	virtual void SendBOB() { }
 	virtual void SendEOB() { }
@@ -228,8 +225,9 @@ class CoreExport IRCDProto : public Service
 	 */
 	virtual void SendOper(User *u);
 
+	virtual void SendSASLMechanisms(std::vector<Anope::string> &) { }
 	virtual void SendSASLMessage(const SASL::Message &) { }
-	virtual void SendSVSLogin(const Anope::string &uid, const Anope::string &acc) { }
+	virtual void SendSVSLogin(const Anope::string &uid, NickAlias *na) { }
 
 	virtual bool IsNickValid(const Anope::string &);
 	virtual bool IsChannelValid(const Anope::string &);
@@ -241,6 +239,7 @@ class CoreExport IRCDProto : public Service
 	 * Defaults to Config->ListSize
 	 */
 	virtual unsigned GetMaxListFor(Channel *c);
+	virtual unsigned GetMaxListFor(Channel *c, ChannelMode *cm);
 
 	virtual Anope::string NormalizeMask(const Anope::string &mask);
 };
@@ -248,8 +247,8 @@ class CoreExport IRCDProto : public Service
 class CoreExport MessageSource
 {
 	Anope::string source;
-	User *u;
-	Server *s;
+	User *u = nullptr;
+	Server *s = nullptr;
 
  public:
 	MessageSource(const Anope::string &);
@@ -277,12 +276,37 @@ class CoreExport IRCDMessage : public Service
  public:
 	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) = 0;
 
 	void SetFlag(IRCDMessageFlag f) { flags.insert(f); }
 	bool HasFlag(IRCDMessageFlag f) const { return flags.count(f); }
 };
 
-extern CoreExport IRCDProto *IRCD;
+/** 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;
 
-#endif // PROTOCOL_H
+	/** The current position within the message. */
+	Anope::string::size_type position = 0;
+
+ 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;