Anope 1.9.4-p1 Release

(cherry picked from commit a68d17c17e)

.gitignore

@@ -1,3 +1,4 @@
 config.cache
+include/version.h
 include/sysconf.h
 build/

CMakeLists.txt

@@ -222,7 +222,7 @@ option(USE_RUN_CC_PL "Use run-cc.pl for building" OFF)
 # 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_BINARY_DIR}/language)
 
 # If using Windows, always add the _WIN32 define
 if(WIN32)
@@ -238,7 +238,7 @@ if(MSVC)
   string(REPLACE "/GX " "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
   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")
+  set(CXXFLAGS "${CXXFLAGS} /W4 /wd4100 /wd4251 /wd4706 /wd4800 /wd4996 /EHs")
   add_definitions(-DMSVCPP -D_CRT_SECURE_NO_WARNINGS)
 # Otherwise, we're not using Visual Studio
 else(MSVC)
@@ -248,7 +248,7 @@ else(MSVC)
   if(UNIX)
     set(CXXFLAGS "${CXXFLAGS} -ansi -pedantic")
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-      set(CXXFLAGS "${CXXFLAGS} -Wno-long-long -fno-leading-underscore")
+      set(CXXFLAGS "${CXXFLAGS} -fno-leading-underscore")
     endif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   # If we aren't on a *nix system, we are using MinGW
   else(UNIX)
@@ -261,7 +261,7 @@ endif(MSVC)
 
 # 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})
+  set(LDFLAGS "${LDFLAGS} -l${CMAKE_DL_LIBS}")
 endif(CMAKE_DL_LIBS)
 
 # Under MinGW, the -shared flag isn't properly set in the module-specific linker flags, add it from the C flags for shared libraries
@@ -297,12 +297,12 @@ if(NOT MSVC)
     # 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)
+      set(LDFLAGS "${LDFLAGS} -lsocket")
     endif(HAVE_SOCKET_LIB)
     # 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)
+      set(LDFLAGS "${LDFLAGS} -lnsl")
     endif(HAVE_NSL_LIB)
     # 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)
@@ -329,25 +329,29 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINF
 endif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO")
 
 # 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(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(strings.h HAVE_STRINGS_H)
+check_include_file(sys/eventfd.h HAVE_SYS_EVENTFD_H)
 
 # Check for the existance of the following functions
 check_function_exists(setgrent HAVE_SETGRENT)
 check_function_exists(strcasecmp HAVE_STRCASECMP)
 check_function_exists(stricmp HAVE_STRICMP)
+check_function_exists(strlcat HAVE_STRLCAT)
+check_function_exists(strlcpy HAVE_STRLCPY)
 check_function_exists(umask HAVE_UMASK)
-check_function_exists(epoll_wait HAVE_EPOLL)
-check_function_exists(poll HAVE_POLL)
-check_function_exists(kqueue HAVE_KQUEUE)
+check_function_exists(backtrace HAVE_BACKTRACE)
+check_function_exists(eventfd HAVE_EVENTFD)
 
-# Check if eventfd works
-try_run(EVENTFD_TEST_RUN_RESULT EVENTFD_TEST_COMPILE_RESULT ${CMAKE_CURRENT_BINARY_DIR} ${Anope_SOURCE_DIR}/cmake/eventfd_test.cpp)
-set(HAVE_EVENTFD FALSE)
-if (EVENTFD_TEST_COMPILE_RESULT AND EVENTFD_TEST_RUN_RESULT EQUAL 1)
-  set(HAVE_EVENTFD TRUE)
-endif(EVENTFD_TEST_COMPILE_RESULT AND EVENTFD_TEST_RUN_RESULT EQUAL 1)
+# Check for the existance of the following types
+check_type_size(uint8_t UINT8_T)
+check_type_size(u_int8_t U_INT8_T)
+check_type_size(int16_t INT16_T)
+check_type_size(uint16_t UINT16_T)
+check_type_size(u_int16_t U_INT16_T)
+check_type_size(int32_t INT32_T)
+check_type_size(uint32_t UINT32_T)
+check_type_size(u_int32_t U_INT32_T)
 
 # Strip the leading and trailing spaces from the compile flags
 if(CXXFLAGS)

Config

@@ -151,49 +151,15 @@ while [ $# -ge 1 ] ; do
 	shift 1
 done
 
-###########################################################################
-# Check for CMake and (optionally) install it
 ###########################################################################
 
 which cmake > /dev/null
 if [ $? -ne 0 ] ; then
 	clear
-	if exists "cmake-bin" ; then :
-	else
-		echo "Anope requires CMake 2.4 or newer, which can be downloaded at http://cmake.org"
-		echo "If you have installed CMake already, ensure it is in your PATH environment variable."
-
-		if [ `uname` = "Linux" ] ; then
-
-			echo ""
-			echo "Config can attempt to install CMake for you now, which"
-			echo "will take approximately 50 MB of disk space."
-			echo "Would you like to install CMake now?"
-			echo2 "[y] "
-			read YN
-			if [ "$YN" = "n" ] ; then
-				exit 0
-			fi
-
-			echo "Downloading CMake... this may take a minute or two."
-			wget -q http://anope.org/cmake/linux-i386.php -O cmake-bin.tar.gz
-			if [ $? -ne 0 ] ; then
-				rm -f cmake-bin.tar.gz
-				echo "Unable to download CMake"
-				exit 0
-			fi
-			mkdir -p cmake-bin
-			tar zxf cmake-bin.tar.gz -C cmake-bin
-			rm -f cmake-bin.tar.gz
-			echo "Done!"
-		else
-			exit 0
-		fi
-	fi
-
-	CMAKE_BIN=`find cmake-bin -name cmake`
-	CMAKE_BIN="`pwd`/`dirname $CMAKE_BIN`"
-	PATH="$PATH:$CMAKE_BIN"
+	echo "Anope requires CMake 2.4 or newer to be configured, which can"
+	echo "be downloaded at http://www.cmake.org/. If you have installed"
+	echo "CMake already, ensure it is in your PATH environment variable."
+	exit 0
 fi
 
 ###########################################################################
@@ -212,17 +178,11 @@ if [ ! "$NO_INTRO" ] ; then
 	if [ -d .git ] ; then
 		VERSION=`git describe --tags`
 		VERSION_BUILD=`echo "$VERSION" | cut -d'-' -f2`
-		if [ "$SOURCE_DIR" = "." ] ; then
-			test -d build || mkdir -p build/include
-			BUILD_DIR="build"
-		else
-			BUILD_DIR="."
-		fi
 		VERSION_EXTRA=`echo "$VERSION" | cut -d'-' -f3`
 		# Only do this if we are not on a tag, src/version.sh will be all we need then.
 		if [ "$VERSION_BUILD" != "$VERSION_EXTRA" ] ; then
-			echo "#define VERSION_BUILD	$VERSION_BUILD" > $BUILD_DIR/include/version.h
-			echo "#define VERSION_EXTRA	\"-$VERSION_EXTRA\"" >> $BUILD_DIR/include/version.h
+			echo "#define VERSION_BUILD	$VERSION_BUILD" > include/version.h
+			echo "#define VERSION_EXTRA	\"-$VERSION_EXTRA\"" >> include/version.h
 		fi
 	fi
 	cat $SOURCE_DIR/.BANNER | sed "s/CURVER/$VERSION/" | sed "s@SOURCE_DIR@$SOURCE_DIR@" | $PAGER

cmake/Anope.cmake

@@ -479,7 +479,7 @@ macro(calculate_libraries SRC SKIP SRC_LDFLAGS EXTRA_DEPENDS)
     endforeach(LIBRARY_PATH)
     # Iterate through libraries and add them to the linker flags
     foreach(LIBRARY ${LIBRARIES})
-      append_to_list(EXTRA_DEPENDENCIES "${LIBRARY}")
+      set(THIS_LDFLAGS "${THIS_LDFLAGS} -l${LIBRARY}")
     endforeach(LIBRARY)
     set(${SRC_LDFLAGS} "${THIS_LDFLAGS}")
     set(${EXTRA_DEPENDS} "${EXTRA_DEPENDENCIES}")

cmake/eventfd_test.cpp

@@ -1,8 +0,0 @@
-#include <sys/eventfd.h>
-
-int main()
-{
-	int i = eventfd(0, EFD_NONBLOCK);
-	return i >= 0 ? 1 : 0;
-}
-

data/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Only install example.chk and 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)
+set(DATA example.chk example.conf mysql/tables.sql)
 install(FILES ${DATA}
   DESTINATION data
 )

data/botserv.example.conf

@@ -1,249 +0,0 @@
-/*
- * Example configuration file for BotServ.
- */
-
-/*
- * First, create the service.
- */
-service
-{
-	/*
-	 * The name of the BotServ client
-	 */
-	nick = "BotServ"
-
-	/*
-	 * The username of the BotServ client.
-	 */
-	user = "services"
-
-	/*
-	 * The hostname of the BotServ client.
-	 */
-	host = "services.host"
-
-	/*
-	 * The realname of the BotServ client.
-	 */
-	gecos = "Bot Service"
-
-	/*
-	 * The modes this client should use.
-	 * Do not modify this unless you know what you are doing.
-	 *
-	 * These modes are very IRCd specific. If left commented, sane defaults
-	 * are used based on what protocol module you have loaded.
-	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
-	 * unable to do certain things if this option is enabled.
-	 */
-	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
-	 */
-	#channels = "@#services,#mychan"
-}
-
-/*
- * Core BotServ module.
- *
- * Provides essential functionality for BotServ.
- */
-module { name = "botserv" }
-
-/*
- * Configuration for BotServ provided by bs_main.
- */
-botserv
-{
-	/*
-	 * The name of the client that should be BotServ.
-	 */
-	name = "BotServ"
-
-	/*
-	 * The default bot options for newly registered channels. Note that changing these options
-	 * will have no effect on channels which are already registered. The list must be separated
-	 * by spaces.
-	 *
-	 * The options are:
-	 * -    dontkickops: Channel operators will be protected against BotServ kicks
-	 * - dontkickvoices: Voiced users will be protected against BotServ kicks
-	 * -          greet: The channel's BotServ bot will greet incoming users that have set a greet
-	 *                     in their NickServ settings
-	 * -        fantasy: Enables the use of BotServ fantasy commands in the channel
-	 *
-	 * This directive is optional, if left blank, there will be no defaults.
-	 */
-	defaults="greet fantasy"
-
-	/*
-	 * The minimum number of users there must be in a channel before the bot joins it. The best
-	 * value for this setting is 1 or 2. This can be 0, the service bots will not part unless
-	 * specifically unassigned, and will keep the channel open.
-	 */
-	minusers = 1
-
-	/*
-	 * The maximum number of entries a single bad words list can have. Setting it too high can
-	 * reduce performance slightly.
-	 */
-	badwordsmax = 32
-
-	/*
-	 * The amount of time that data for a user is valid in BotServ. If the data exceeds this time,
-	 * it is reset or deleted depending on the case. Do not set it too high, otherwise your
-	 * resources will be slightly affected.
-	 */
-	keepdata = 10m
-
-	/*
-	 * The bots are currently not affected by any modes or bans when they try to join a channel.
-	 * But some people may want to make it act like a real bot, that is, for example, remove all
-	 * the bans affecting the bot before joining the channel, remove a ban that affects the bot
-	 * set by a user when it is in the channel, and so on. Since it consumes a bit more CPU
-	 * time, you should not enable this on larger networks.
-	 *
-	 * This directive is optional.
-	 */
-	#smartjoin = yes
-
-	/*
-	 * If set, the bots will use a kick reason that does not state the word when it is kicking.
-	 * This is especially useful if you have young people on your network.
-	 *
-	 * This directive is optional.
-	 */
-	gentlebadwordreason = yes
-
-	/*
-	 * If set, BotServ will use case sensitive checking for badwords.
-	 *
-	 * This directive is optional.
-	 */
-	#casesensitive = yes
-
-	/*
-	 * Defines the prefixs for fantasy commands in channels. One of these characters will have to be prepended
-	 * to all fantasy commands. If you choose "!", for example, fantasy commands will be "!kick",
-	 * "!op", etc. This directive is optional, if left out, the default fantasy character is "!".
-	 */
-	#fantasycharacter = "!."
-}
-
-/*
- * Core BotServ commands.
- *
- * In Anope modules can provide (multiple) commands, each of which has a unique command name. Once these modules
- * are loaded you can then configure the commands to be added to any client you like with any name you like.
- *
- * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
- *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
- */
-
-/* Give it a help command */
-command { service = "BotServ"; name = "HELP"; command = "generic/help"; }
-
-/*
- * bs_assign
- *
- * Provides the commands botserv/assign and botserv/unassign.
- *
- * Used for assigning and unassigning bots to channels.
- */
-module { name = "bs_assign" }
-command { service = "BotServ"; name = "ASSIGN"; command = "botserv/assign"; }
-command { service = "BotServ"; name = "UNASSIGN"; command = "botserv/unassign"; }
-
-/*
- * bs_autoassign
- *
- * Allows service bots to be automatically assigned to channels upon registration.
- */
-#module { name = "bs_autoassign" }
-bs_autoassign
-{
-	/*
-	 * Automatically assign ChanServ to channels upon registration.
-	 */
-	bot = "ChanServ"
-}
-
-/*
- * bs_badwords
- *
- * Provides the command botserv/badwords.
- *
- * Used for controlling the channel badword list.
- */
-module { name = "bs_badwords" }
-command { service = "BotServ"; name = "BADWORDS"; command = "botserv/badwords"; }
-
-/*
- * bs_bot
- *
- * Provides the command botserv/bot.
- *
- * Used for administrating BotServ bots.
- */
-module { name = "bs_bot" }
-command { service = "BotServ"; name = "BOT"; command = "botserv/bot"; }
-
-/*
- * bs_botlist
- *
- * Provides the command botserv/botlist.
- *
- * Used for listing all available bots.
- */
-module { name = "bs_botlist" }
-command { service = "BotServ"; name = "BOTLIST"; command = "botserv/botlist"; }
-
-/*
- * bs_control
- *
- * Provides the commands botserv/act and botserv/say.
- *
- * Used for making the bot message a channel.
- */
-module { name = "bs_control" }
-command { service = "BotServ"; name = "ACT"; command = "botserv/act"; }
-command { service = "BotServ"; name = "SAY"; command = "botserv/say"; }
-
-/*
- * bs_info
- *
- * Provides the command botserv/info.
- *
- * Used for getting information on bots or channels.
- */
-module { name = "bs_info" }
-command { service = "BotServ"; name = "INFO"; command = "botserv/info"; }
-
-/*
- * bs_kick
- *
- * Provides the command botserv/kick.
- *
- * Used for configuring what bots should kick for.
- */
-module { name = "bs_kick" }
-command { service = "BotServ"; name = "KICK"; command = "botserv/kick"; }
-
-/*
- * bs_set
- *
- * Provides the command botserv/set.
- *
- * Used for setting options such as kickers and fantasy replies.
- */
-module { name = "bs_set" }
-command { service = "BotServ"; name = "SET"; command = "botserv/set"; }
-

data/global.example.conf

@@ -1,124 +0,0 @@
-/*
- * Example configuration file for Global.
- */
-
-/*
- * First, create the service.
- */
-service
-{
-	/*
-	 * The name of the Global client
-	 */
-	nick = "Global"
-
-	/*
-	 * The username of the Global client.
-	 */
-	user = "services"
-
-	/*
-	 * The hostname of the Global client.
-	 */
-	host = "services.host"
-
-	/*
-	 * The realname of the Global client.
-	 */
-	gecos = "Global Noticer"
-
-	/*
-	 * The modes this client should use.
-	 * Do not modify this unless you know what you are doing.
-	 *
-	 * These modes are very IRCd specific. If left commented, sane defaults
-	 * are used based on what protocol module you have loaded.
-	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
-	 * unable to do certain things if this option is enabled.
-	 */
-	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
-	 */
-	#channels = "@#services,#mychan"
-}
-
-/*
- * Core Global module.
- *
- * Provides essential functionality for Global.
- */
-module { name = "global" }
-
-/*
- * Configuration for Global provided by gl_main.
- */
-global
-{
-	/*
-	 * The name of the client that should be Global.
-	 */
-	name = "Global"
-
-	/*
-	 * If set, Services will send global messages on starting up and shutting
-	 * down/restarting.
-	 *
-	 * This directive is optional.
-	 */
-	#globaloncycle = yes
-
-	/*
-	 * This is the global message that will be sent when Services are being
-	 * shutdown/restarted. This directive is only required if you enable
-	 * globaloncycle above.
-	 */
-	globaloncycledown = "Services are restarting, they will be back shortly - please be good while we're gone"
-
-	/*
-	 * This is the global message that will be sent when Services (re)join the
-	 * network. This directive is only required if you enable globaloncycle above.
-	 */
-	globaloncycleup = "Services are now back online - have a nice day"
-
-	/*
-	 * If set, Services will hide the IRC operator's nick in a global
-	 * message/notice.
-	 *
-	 * This directive is optional.
-	 */
-	#anonymousglobal = yes
-}
-
-/*
- * Core Global commands.
- *
- * In Anope modules can provide (multiple) commands, each of which has a unique command name. Once these modules
- * are loaded you can then configure the commands to be added to any client you like with any name you like.
- *
- * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
- *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
- */
-
-/* Give it a help command */
-command { service = "Global"; name = "HELP"; command = "generic/help"; }
-
-/*
- * gl_global
- *
- * Provides the command global/global.
- *
- * Used for sending a message to every online user.
- */
-module { name = "gl_global" }
-command { service = "OperServ"; name = "GLOBAL"; command = "global/global"; permission = "operserv/global"; }
-command { service = "Global"; name = "GLOBAL"; command = "global/global"; permission = "global/global"; }
-

data/hostserv.example.conf

@@ -1,200 +0,0 @@
-/*
- * Example configuration file for HostServ.
- */
-
-/*
- * First, create the service.
- */
-service
-{
-	/*
-	 * The name of the HostServ client
-	 */
-	nick = "HostServ"
-
-	/*
-	 * The username of the HostServ client.
-	 */
-	user = "services"
-
-	/*
-	 * The hostname of the HostServ client.
-	 */
-	host = "services.host"
-
-	/*
-	 * The realname of the HostServ client.
-	 */
-	gecos = "vHost Service"
-
-	/*
-	 * The modes this client should use.
-	 * Do not modify this unless you know what you are doing.
-	 *
-	 * These modes are very IRCd specific. If left commented, sane defaults
-	 * are used based on what protocol module you have loaded.
-	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
-	 * unable to do certain things if this option is enabled.
-	 */
-	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
-	 */
-	#channels = "@#services,#mychan"
-}
-
-/*
- * Core HostServ module.
- *
- * Provides essential functionality for HostServ.
- */
-module { name = "hostserv" }
-
-/*
- * Configuration for HostServ provided by hs_main.
- */
-hostserv
-{
-	/*
-	 * The name of the client that should be HostServ.
-	 */
-	name = "HostServ"
-
-	/*
-	 * The characters allowed in a vhost. 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. Note these are 1 byte characters, so
-	 * UTF-8 characters will not work.
-	 *
-	 * It is recommended you DON'T change this.
-	 */
-	vhost_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.-"
-
-	/*
-	 * If set, allows vhosts to not contain dots (.).
-	 * Newer IRCds generally do not have a problem with this, but the same warning as
-	 * vhost_chars applies.
-	 *
-	 * It is recommended you DON'T change this.
-	 */
-	allow_undotted_vhosts = false
-
-	/*
-	 * The characters that are not allowed to be at the very beginning or very ending
-	 * of a vhost. The same warning as vhost_chars applies.
-	 *
-	 * It is recommended you DON'T change this.
-	 */
-	disallow_start_or_end = ".-"
-}
-
-/*
- * Core HostServ commands.
- *
- * In Anope modules can provide (multiple) commands, each of which has a unique command name. Once these modules
- * are loaded you can then configure the commands to be added to any client you like with any name you like.
- *
- * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
- *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
- */
-
-/* Give it a help command */
-command { service = "HostServ"; name = "HELP"; command = "generic/help"; }
-
-/*
- * hs_del
- *
- * Provides the commands hostserv/del and hostserv/delall.
- *
- * Used for removing users vHosts.
- */
-module { name = "hs_del" }
-command { service = "HostServ"; name = "DEL"; command = "hostserv/del"; permission = "hostserv/del"; }
-command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; permission = "hostserv/del"; }
-
-/*
- * hs_group
- *
- * Provides the command hostserv/group.
- *
- * Used for grouping one vHost to many nicks.
- */
-module { name = "hs_group" }
-command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }
-
-/*
- * hs_list
- *
- * Provides the command hostserv/list.
- *
- * Used for listing actively set vHosts.
- */
-module { name = "hs_list" }
-command { service = "HostServ"; name = "LIST"; command = "hostserv/list"; permission = "hostserv/list"; }
-
-/*
- * hs_off
- *
- * Provides the command hostserv/off.
- *
- * Used for turning off your vHost.
- */
-module { name = "hs_off" }
-command { service = "HostServ"; name = "OFF"; command = "hostserv/off"; }
-
-/*
- * hs_on
- *
- * Provides the command hostserv/on.
- *
- * Used for turning on your vHost.
- */
-module { name = "hs_on" }
-command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
-
-/*
- * hs_request
- *
- * Provides the commands hostserv/request, hostserv/active, hostserv/reject, and hostserv/waiting.
- *
- * Used to manage vhosts requested by users.
- */
-module { name = "hs_request" }
-command { service = "HostServ"; name = "REQUEST"; command = "hostserv/request"; }
-command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set"; }
-hs_request
-{
-	/*
-	 * If set, Services 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.
-	 */
-	#memooper = yes
-}
-
-/*
- * hs_set
- *
- * Provides the commands hostserv/set and hostserv/setall.
- *
- * Used for setting users vhosts.
- */
-module { name = "hs_set" }
-command { service = "HostServ"; name = "SET"; command = "hostserv/set"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "SETALL"; command = "hostserv/setall"; permission = "hostserv/set"; }
-

data/memoserv.example.conf

@@ -1,237 +0,0 @@
-/*
- * Example configuration file for MemoServ.
- */
-
-/*
- * First, create the service.
- */
-service
-{
-	/*
-	 * The name of the MemoServ client
-	 */
-	nick = "MemoServ"
-
-	/*
-	 * The username of the MemoServ client.
-	 */
-	user = "services"
-
-	/*
-	 * The hostname of the MemoServ client.
-	 */
-	host = "services.host"
-
-	/*
-	 * The realname of the MemoServ client.
-	 */
-	gecos = "Memo Service"
-
-	/*
-	 * The modes this client should use.
-	 * Do not modify this unless you know what you are doing.
-	 *
-	 * These modes are very IRCd specific. If left commented, sane defaults
-	 * are used based on what protocol module you have loaded.
-	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
-	 * unable to do certain things if this option is enabled.
-	 */
-	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
-	 */
-	#channels = "@#services,#mychan"
-}
-
-/*
- * Core MemoServ module.
- *
- * Provides essential functionality for MemoServ.
- */
-module { name = "memoserv" }
-
-/*
- * Configuration for MemoServ provided by ms_main.
- */
-memoserv
-{
-	/*
-	 * The name of the client that should be MemoServ. Clients are configured
-	 * with the service blocks.
-	 */
-	name = "MemoServ"
-
-	/*
-	 * The maximum number of memos a user is allowed to keep by default. Normal users may set the
-	 * limit anywhere between 0 and this value. Services Admins can change it to any value or
-	 * disable it.
-	 *
-	 * This directive is optional, but recommended. If not set, the limit is disabled
-	 * by default, and normal users can set any limit they want.
-	 */
-	maxmemos = 20
-
-	/*
-	 * The delay between consecutive uses of the MemoServ SEND command. This can help prevent spam
-	 * as well as denial-of-service attacks from sending large numbers of memos and filling up disk
-	 * space (and memory). The default 3-second wait means a maximum average of 150 bytes of memo
-	 * per second per user under the current IRC protocol.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	senddelay = 3s
-
-	/*
-	 * Allow the use of memo receipts for the following groups:
-	 *
-	 * 1 - Opers Only
-	 * 2 - Everybody
-	 *
-	 * This directive is optional.
-	 */
-	#memoreceipt = 1
-}
-
-/*
- * Core MemoServ commands.
- *
- * In Anope modules can provide (multiple) commands, each of which has a unique command name. Once these modules
- * are loaded you can then configure the commands to be added to any client you like with any name you like.
- *
- * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
- *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
- */
-
-/* Give it a help command */
-command { service = "MemoServ"; name = "HELP"; command = "generic/help"; }
-
-/*
- * ms_cancel
- *
- * Provides the command memoserv/cancel.
- *
- * Used to cancel memos already sent but not yet read.
- */
-module { name = "ms_cancel" }
-command { service = "MemoServ"; name = "CANCEL"; command = "memoserv/cancel"; }
-
-/*
- * ms_check
- *
- * Provides the command memoserv/check.
- *
- * Used to check if a sent memo has been read.
- */
-module { name = "ms_check" }
-command { service = "MemoServ"; name = "CHECK"; command = "memoserv/check"; }
-
-/*
- * ms_del
- *
- * Provides the command memoserv/del.
- *
- * Used to delete your memos.
- */
-module { name = "ms_del" }
-command { service = "MemoServ"; name = "DEL"; command = "memoserv/del"; }
-
-/*
- * ms_ignore
- *
- * Provides the command memoserv/ignore.
- *
- * Used to ignore memos from specific users.
- */
-module { name = "ms_ignore" }
-command { service = "MemoServ"; name = "IGNORE"; command = "memoserv/ignore"; }
-
-/*
- * ms_info
- *
- * Provides the command memoserv/info.
- *
- * Used to show memo related information about an account or a channel.
- */
-module { name = "ms_info" }
-command { service = "MemoServ"; name = "INFO"; command = "memoserv/info"; }
-
-/*
- * ms_list
- *
- * Provides the command memoserv/list.
- *
- * Used to list your current memos.
- */
-module { name = "ms_list" }
-command { service = "MemoServ"; name = "LIST"; command = "memoserv/list"; }
-
-/*
- * ms_read
- *
- * Provides the command memoserv/read.
- *
- * Used to read your memos.
- */
-module { name = "ms_read" }
-command { service = "MemoServ"; name = "READ"; command = "memoserv/read"; }
-
-/*
- * ms_rsend
- *
- * Provides the command memoserv/rsend.
- *
- * Used to send a memo requiring a receipt be sent back once it is read.
- * 
- * Requires configuring memoserv:memoreceipt.
- */
-#module { name = "ms_rsend" }
-#command { service = "MemoServ"; name = "RSEND"; command = "memoserv/rsend"; }
-
-/*
- * ms_send
- *
- * Provides the command memoserv/send
- *
- * Used to send memos.
- */
-module { name = "ms_send" }
-command { service = "MemoServ"; name = "SEND"; command = "memoserv/send"; }
-
-/*
- * ms_sendall
- *
- * Provides the command memoserv/sendall
- *
- * Used to send a mass memo to every registered user.
- */
-module { name = "ms_sendall" }
-command { service = "MemoServ"; name = "SENDALL"; command = "memoserv/sendall"; permission = "memoserv/sendall"; }
-
-/*
- * ms_set
- *
- * Provides the command memoserv/set.
- *
- * Used to set settings such as how you are notified of new memos, and your memo limit.
- */
-module { name = "ms_set" }
-command { service = "MemoServ"; name = "SET"; command = "memoserv/set"; }
-
-/*
- * ms_staff
- *
- * Provides the command memoserv/staff.
- *
- * Used to send a memo to all registered staff members.
- */
-module { name = "ms_staff" }
-command { service = "MemoServ"; name = "STAFF"; command = "memoserv/staff"; permission = "memoserv/staff"; }
-

data/modules.example.conf

@@ -1,396 +0,0 @@
-
-/*
- * [OPTIONAL] Non-Core Modules
- *
- * 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.
- */
-
-/*
- * help
- *
- * Provides commands generic/help
- *
- * Is a generic help command that can be used with any client.
- */
-module { name = "help" }
-
-/*
- * m_dnsbl
- *
- * Allows configurable DNS blacklists to check connecting users against. If a user
- * is found on the blacklist they will be immediately banned. This is a crucial module
- * to prevent bot attacks.
- */
-module { name = "m_dnsbl" }
-m_dnsbl
-{
-	/*
-	 * If set, Services 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
-	 * of DNS queries open at once. Whilst services are not drastically affected by this, your nameserver/DNSBL
-	 * might care.
-	 */
-	check_on_netburst = no
-
-	/*
-	 * If set, OperServ will add clients found in the DNSBL to the akill list. Without it, OperServ simply sends
-	 * a timed G/K-line to the IRCd and forgets about it. Can be useful if your akill list is being fill up by bots.
-	 */
-	add_to_akill = yes
-}
-blacklist
-{
-	/* Name of the blacklist */
-	name = "rbl.efnetrbl.org"
-
-	/* How long to set the ban for */
-	time = 4h
-
-	/* Reason for akill.
-	 * %n is the nick of the user
-	 * %u is the ident/username of the user
-	 * %g is the realname of the user
-	 * %h is the hostname of the user
-	 * %i is the IP of the user
-	 * %r is the 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"
-
-	/* Replies to ban and their reason. If this is totally ommited all replies get banned */
-	1 = "Open Proxy"
-	/* Don't ban for result 2 or 3 */
-	#2 = "spamtrap666"
-	#3 = "spamtrap50"
-	4 = "TOR"
-	5 = "Drones / Flooding"
-}
-blacklist
-{
-	name = "dnsbl.dronebl.org"
-	time = 4h
-	reason = "You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded.do?ip=%i&network=%N"
-}
-
-/*
- * m_helpchan
- *
- * Gives users who are op in the specified help channel usermode +h (helpop).
- */
-#module { name = "m_helpchan" }
-m_helpchan
-{
-	helpchannel = "#help"
-}
-
-/*
- * m_ldap
- *
- * This module allows other modules to use LDAP. By itself, this module does nothing useful.
- */
-#module { name = "m_ldap" }
-ldap
-{
-	server = "ldap://127.0.0.1"
-	port = 389
-	admin_binddn = "cn=Manager,dc=anope,dc=org"
-	admin_password = "secret"
-}
-
-/*
- * m_ldap_authentication
- *
- * This module allows many commands such as IDENTIFY, RELEASE, RECOVER, GHOST, etc. use
- * LDAP to authenticate users. Requires m_ldap.
-*/
-#module { name = "m_ldap_authentication" }
-m_ldap_authentication
-{
-	/*
-	 * The distinguished name we should bind to when a user tries to identify.
-	 */
-	binddn = "ou=users,dc=anope,dc=org"
-
-	/*
-	 * The object class used by LDAP to store user account information.
-	 * Used for adding new users to LDAP if disable_ns_register is false
-	 */
-	object_class = "anopeUser"
-
-	/*
-	 * The attribute value used for account names.
-	 */
-	username_attribute = "uid"
-
-	/*
-	 * The attribute value used for email addresses.
-	 * This directive is optional.
-	 */
-	email_attribute = "email"
-
-	/*
-	 * The attribute value used for passwords.
-	 * Used when registering new accounts in LDAP.
-	 */
-	password_attribute = "userPassword"
-
-	/*
-	 * Enable to have this module disable /nickserv register.
-	 */
-	disable_ns_register = false
-
-	/*
-	 * The reason to give the users who try to /ns register if
-	 * disable_ns_register is enabled.
-	 */
-	#disable_reason = "To register on this network visit http://some.misconfigured.site/register"
-}
-
-/*
- * m_ldap_oper
- *
- * 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.
- */
-#module { name = "m_ldap_oper" }
-m_ldap_oper
-{
-	/*
-	 * An optional binddn to use when searching for groups.
-	 * %a is replaced with the account name of the user.
-	 */
-	#binddn = "cn=Manager,dc=anope,dc=org"
-
-	/*
-	 * An optional password to bind with.
-	 */
-	#password = "secret"
-
-	/*
-	 * The base DN where the groups are.
-	 */
-	basedn = "ou=groups,dc=anope,dc=org"
-
-	/*
-	 * The filter to use when searching for users.
-	 * %a is replaced with the account name of the user.
-	 */
-	filter = "(member=uid=%a,ou=users,dc=anope,dc=org)"
-
-	/*
-	 * The attribute of the group that is the name of the opertype.
-	 * The cn attribute should match a known opertype in the config.
-	 */
-	opertype_attribute = "cn"
-}
-
-/*
- * m_mysql
- *
- * This module allows other modules to use MySQL.
- */
-#module { name = "m_mysql" }
-mysql
-{
-	/* The name of this service */
-	name = "mysql/main"
-	database = "anope"
-	server = "127.0.0.1"
-	username = "anope"
-	password = "mypassword"
-	port = 3306
-}
-
-/*
- * m_proxyscan
- *
- * This module allows you to scan connecting clients for open proxies.
- * Note that using this will allow users to get the IP or your services.
- *
- * Currently the two supported proxy types are HTTP and SOCKS5.
- *
- * The proxy scanner works by attempting to connect to clients when they
- * connect to the network, and if they have a proxy running instruct it to connect
- * back to services. If services are able to connect through the proxy to itself
- * then it knows it is an insecure proxy, and will ban it.
- */
-#module { name = "m_proxyscan" }
-m_proxyscan
-{
-	/*
-	 * The target IP services tells the proxy to connect back to. This must be a publicly
-	 * avaiable IP that remote proxies can connect to.
-	 */
-	#target_ip = "127.0.0.1"
-	
-	/*
-	 * The port services tells the proxy to connect to.
-	 */
-	target_port = 7226
-
-	/*
-	 * The listen IP services listen on for incoming connections from suspected proxies.
-	 * This probably will be the same as target_ip, but may not be if you are behind a firewall (NAT).
-	 */
-	#listen_ip = "127.0.0.1"
-
-	/*
-	 * The port services should listen on for incoming connections from suspected proxies.
-	 * This most likely will be the same as target_port.
-	 */
-	listen_port = 7226
-
-	/*
-	 * An optional notice sent to clients upon connect.
-	 */
-	#connect_notice = "We will now scan your host for insecure proxies. If you do not consent to this scan please disconnect immediately"
-
-	/*
-	 * Who the notice should be sent from.
-	 */
-	#connect_source = "OperServ"
-
-	/*
-	 * If set, OperServ will add infected clients to the akill list. Without it, OperServ simply sends
-	 * a timed G/K-line to the IRCd and forgets about it. Can be useful if your akill list is being fill up by bots.
-	 */
-	add_to_akill = yes
-
-	/*
-	 * How long before connections should be timed out.
-	 */
-	timeout = 5
-}
-
-/*
- * A proxyscan block (must have m_proxyscan loaded).
- * You may have multiple proxyscan blocks.
- */
-proxyscan
-{
-	/* The type of proxy to check for. A comma separated list is allowed */
-	type = "HTTP"
-
-	/* The ports to check */
-	port = "80,8080"
-
-	/* How long to set the ban for */
-	time = 4h
-
-	/*
-	 * The reason to ban the user for.
-	 * %h is replaced with the type of proxy found.
-	 * %i is replaced with the IP of proxy found.
-	 * %p is replaced with the port.
-	 */
-	reason = "You have an open proxy running on your host (%t:%i:%p)"
-}
-
-/*
- * m_sqlite
- *
- * This module allows other modules to use SQLite.
- */
-#module { name = "m_sqlite" }
-sqlite
-{
-	/* The name of this service */
-	name = "sqlite/main"
-	/* The database name, it will be created if it does not exist. */
-	database = "anope.db"
-}
-
-/*
- * m_rewrite
- *
- * Allows rewriting commands sent to clients.
- */
-#module { name = "m_rewrite" }
-rewrite
-{
-	/* The client to apply this rewrite to. */
-	client = "ChanServ"
-
-	/* Source message to match. A $ can be used to match anything. */
-	source_message = "CLEAR $ USERS"
-	
-	/*
-	 * Message to rewrite the source message to. A $ followed by a number, eg $0, gets
-	 * replaced by the number-th word from the source_message, starting from 0.
-	 */
-	target_message = "CLEARUSERS $1"
-}
-
-/*
- * m_ssl
- *
- * This module uses SSL to connect to the uplink server(s)
- */
-module { name = "m_ssl" }
-
-/*
- * m_statusupdate
- *
- * This module automatically updates users status on channels when the
- * channel's access list is modified.
- */
-module { name = "m_statusupdate" }
-
-/* 
- * m_xmlrpc
- *
- * Allows remote applications (websites) to execute queries in real time to retrieve data from Anope.
- * By itself this module does nothing, but allows other modules (m_xmlrpc_main) to receive and send XMLRPC queries.
- */
-#module { name = "m_xmlrpc" }
-m_xmlrpc
-{
-	/* IP to listen on */
-	bindip = "127.0.0.1"
-	/* Port to listen on */
-	port = 26673
-	/* Enable for IPv6 */
-	ipv6 = no
-	/* If enabled, requires m_ssl to be loaded */
-	ssl = no
-        /* IPs allowed to connect (separate with spaces), this should be secured. We also recommend you firewall this
-         * with an outside program to increase security.
-         */
-	allowed = "127.0.0.0/24"
-}
-
-/*
- * m_xmlrpc_main
- *
- * Adds the main XMLRPC core functions.
- * Requires m_xmlrpc.
- */
-#module { name = "m_xmlrpc_main" }
-
-/*
- * ns_maxemail
- *
- * Limits how many times the same email address may be used in Anope
- * to register accounts.
- */
-module { name = "ns_maxemail" }
-ns_maxemail
-{
-	/*
-	 * The limit to how many registered nicks can use the same e-mail address. If set to 0 or left
-	 * commented, there will be no limit enforced when registering new accounts or using
-	 * /msg NickServ SET EMAIL.
-	 */
-	#maxemails = 1
-}
-

data/mysql/tables.sql

@@ -0,0 +1,445 @@
+-- phpMyAdmin SQL Dump
+-- version 3.3.5
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Generation Time: Apr 28, 2011 at 07:08 PM
+-- Server version: 5.1.50
+-- PHP Version: 5.3.3-pl1-gentoo
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+
+--
+-- Database: `anope`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_bs_badwords`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_bs_badwords` (
+  `channel` varchar(255) NOT NULL DEFAULT '',
+  `word` varchar(255) NOT NULL,
+  `type` varchar(50) NOT NULL,
+  UNIQUE KEY `channel` (`channel`,`word`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_bs_core`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_bs_core` (
+  `nick` varchar(255) NOT NULL DEFAULT '',
+  `user` varchar(255) NOT NULL DEFAULT '',
+  `host` text NOT NULL,
+  `rname` text NOT NULL,
+  `flags` text NOT NULL,
+  `created` int(10) unsigned NOT NULL DEFAULT '0',
+  `chancount` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`nick`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_bs_info_metadata`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_bs_info_metadata` (
+  `botname` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `value` text NOT NULL,
+  KEY `FK_anope_bs_info_metadata_botname` (`botname`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_access`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_access` (
+  `level` int(11) NOT NULL DEFAULT '0',
+  `display` varchar(255) NOT NULL DEFAULT '',
+  `channel` varchar(255) NOT NULL DEFAULT '',
+  `last_seen` int(10) unsigned NOT NULL DEFAULT '0',
+  `creator` varchar(255) NOT NULL DEFAULT '',
+  UNIQUE KEY `channel` (`channel`,`display`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_akick`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_akick` (
+  `channel` varchar(255) NOT NULL DEFAULT '',
+  `flags` varchar(255) NOT NULL DEFAULT '',
+  `mask` varchar(255) NOT NULL DEFAULT '',
+  `reason` text NOT NULL,
+  `creator` varchar(255) NOT NULL DEFAULT '',
+  `created` int(10) unsigned NOT NULL DEFAULT '0',
+  `last_used` int(10) unsigned NOT NULL DEFAULT '0',
+  UNIQUE KEY `channel` (`channel`,`mask`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_info`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_info` (
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `founder` text NOT NULL,
+  `successor` text NOT NULL,
+  `descr` text NOT NULL,
+  `time_registered` int(10) unsigned NOT NULL DEFAULT '0',
+  `last_used` int(10) unsigned NOT NULL DEFAULT '0',
+  `last_topic` text NOT NULL,
+  `last_topic_setter` text NOT NULL,
+  `last_topic_time` int(10) unsigned NOT NULL DEFAULT '0',
+  `flags` text NOT NULL,
+  `forbidby` text NOT NULL,
+  `forbidreason` text NOT NULL,
+  `bantype` smallint(6) NOT NULL DEFAULT '0',
+  `memomax` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `botnick` varchar(255) NOT NULL DEFAULT '',
+  `botflags` text NOT NULL,
+  `capsmin` smallint(6) NOT NULL DEFAULT '0',
+  `capspercent` smallint(6) NOT NULL DEFAULT '0',
+  `floodlines` smallint(6) NOT NULL DEFAULT '0',
+  `floodsecs` smallint(6) NOT NULL DEFAULT '0',
+  `repeattimes` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_info_metadata`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_info_metadata` (
+  `channel` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `value` text NOT NULL,
+  KEY `FK_anope_cs_info_metadata_channel` (`channel`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_levels`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_levels` (
+  `channel` varchar(255) NOT NULL DEFAULT '',
+  `position` int(11) NOT NULL DEFAULT '0',
+  `level` int(11) NOT NULL DEFAULT '0',
+  UNIQUE KEY `channel` (`channel`,`position`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_mlock`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_mlock` (
+  `channel` varchar(255) NOT NULL,
+  `mode` varchar(127) NOT NULL,
+  `status` int(11) NOT NULL,
+  `setter` varchar(255) NOT NULL,
+  `created` int(11) NOT NULL,
+  `param` varchar(255) NOT NULL,
+  UNIQUE KEY `entry` (`channel`,`mode`,`status`,`setter`,`param`),
+  KEY `FK_anope_cs_mlock` (`channel`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_cs_ttb`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_cs_ttb` (
+  `channel` varchar(255) NOT NULL DEFAULT '',
+  `ttb_id` int(11) NOT NULL DEFAULT '0',
+  `value` int(11) NOT NULL DEFAULT '0',
+  UNIQUE KEY `channel` (`channel`,`ttb_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_extra`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_extra` (
+  `data` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_hs_core`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_hs_core` (
+  `nick` varchar(255) NOT NULL,
+  `vident` varchar(64) NOT NULL,
+  `vhost` varchar(255) NOT NULL,
+  `creator` varchar(255) NOT NULL,
+  `time` int(11) NOT NULL,
+  KEY `FK_anope_hs_core_nick` (`nick`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_info`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_info` (
+  `version` int(11) DEFAULT NULL,
+  `date` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_ms_info`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_ms_info` (
+  `receiver` varchar(255) NOT NULL,
+  `flags` int(11) NOT NULL DEFAULT '0',
+  `time` int(10) unsigned NOT NULL DEFAULT '0',
+  `sender` text NOT NULL,
+  `text` blob NOT NULL,
+  `serv` enum('NICK','CHAN') NOT NULL DEFAULT 'NICK',
+  KEY `FK_anope_ms_info_receiver` (`receiver`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_ns_access`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_ns_access` (
+  `display` varchar(255) NOT NULL DEFAULT '',
+  `access` varchar(160) NOT NULL,
+  KEY `FK_anope_ns_access_display` (`display`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_ns_alias`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_ns_alias` (
+  `nick` varchar(255) NOT NULL DEFAULT '',
+  `last_quit` text NOT NULL,
+  `last_realname` text NOT NULL,
+  `last_usermask` text NOT NULL,
+  `time_registered` int(10) unsigned NOT NULL DEFAULT '0',
+  `last_seen` int(10) unsigned NOT NULL DEFAULT '0',
+  `flags` text NOT NULL,
+  `display` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`nick`),
+  KEY `FK_anope_ns_alias_display` (`display`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_ns_alias_metadata`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_ns_alias_metadata` (
+  `nick` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `value` text NOT NULL,
+  KEY `FK_anope_ns_alias_metadata_nick` (`nick`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_ns_core`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_ns_core` (
+  `display` varchar(255) NOT NULL DEFAULT '',
+  `pass` text NOT NULL,
+  `email` text NOT NULL,
+  `greet` text NOT NULL,
+  `flags` text NOT NULL,
+  `language` varchar(5) NOT NULL DEFAULT '',
+  `channelcount` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `memomax` smallint(5) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`display`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_ns_core_metadata`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_ns_core_metadata` (
+  `nick` varchar(255) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
+  `value` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_os_akills`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_os_akills` (
+  `user` varchar(255) NOT NULL,
+  `host` varchar(255) NOT NULL,
+  `xby` text NOT NULL,
+  `reason` text NOT NULL,
+  `seton` int(10) unsigned NOT NULL DEFAULT '0',
+  `expire` int(10) unsigned NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_os_core`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_os_core` (
+  `maxusercnt` int(11) NOT NULL DEFAULT '0',
+  `maxusertime` int(10) unsigned NOT NULL DEFAULT '0',
+  `akills_count` int(11) NOT NULL DEFAULT '0',
+  `snlines_count` int(11) NOT NULL DEFAULT '0',
+  `sqlines_count` int(11) NOT NULL DEFAULT '0',
+  `szlines_count` int(11) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_os_exceptions`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_os_exceptions` (
+  `mask` varchar(255) NOT NULL,
+  `slimit` int(11) NOT NULL DEFAULT '0',
+  `who` text NOT NULL,
+  `reason` text NOT NULL,
+  `time` int(10) unsigned NOT NULL DEFAULT '0',
+  `expires` int(10) unsigned NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `anope_os_xlines`
+--
+
+CREATE TABLE IF NOT EXISTS `anope_os_xlines` (
+  `type` varchar(20) NOT NULL,
+  `mask` varchar(255) NOT NULL,
+  `xby` text NOT NULL,
+  `reason` text NOT NULL,
+  `seton` int(10) unsigned NOT NULL DEFAULT '0',
+  `expire` int(10) unsigned NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Constraints for dumped tables
+--
+
+--
+-- Constraints for table `anope_bs_badwords`
+--
+ALTER TABLE `anope_bs_badwords`
+  ADD CONSTRAINT `FK_anope_bs_badwords_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_bs_info_metadata`
+--
+ALTER TABLE `anope_bs_info_metadata`
+  ADD CONSTRAINT `FK_anope_bs_info_metadata_botname` FOREIGN KEY (`botname`) REFERENCES `anope_bs_core` (`nick`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_cs_access`
+--
+ALTER TABLE `anope_cs_access`
+  ADD CONSTRAINT `FK_anope_cs_access_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_cs_akick`
+--
+ALTER TABLE `anope_cs_akick`
+  ADD CONSTRAINT `FK_anope_cs_akick_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_cs_info_metadata`
+--
+ALTER TABLE `anope_cs_info_metadata`
+  ADD CONSTRAINT `FK_anope_cs_info_metadata_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_cs_levels`
+--
+ALTER TABLE `anope_cs_levels`
+  ADD CONSTRAINT `FK_anope_cs_levels_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_cs_mlock`
+--
+ALTER TABLE `anope_cs_mlock`
+  ADD CONSTRAINT `FK_anope_cs_mlock_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_cs_ttb`
+--
+ALTER TABLE `anope_cs_ttb`
+  ADD CONSTRAINT `FK_anope_cs_ttb_channel` FOREIGN KEY (`channel`) REFERENCES `anope_cs_info` (`name`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_hs_core`
+--
+ALTER TABLE `anope_hs_core`
+  ADD CONSTRAINT `FK_anope_hs_core_nick` FOREIGN KEY (`nick`) REFERENCES `anope_ns_alias` (`nick`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_ms_info`
+--
+ALTER TABLE `anope_ms_info`
+  ADD CONSTRAINT `FK_anope_ms_info_receiver` FOREIGN KEY (`receiver`) REFERENCES `anope_ns_alias` (`nick`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_ns_access`
+--
+ALTER TABLE `anope_ns_access`
+  ADD CONSTRAINT `FK_anope_ns_access_display` FOREIGN KEY (`display`) REFERENCES `anope_ns_core` (`display`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_ns_alias`
+--
+ALTER TABLE `anope_ns_alias`
+  ADD CONSTRAINT `FK_anope_ns_alias_display` FOREIGN KEY (`display`) REFERENCES `anope_ns_core` (`display`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+--
+-- Constraints for table `anope_ns_alias_metadata`
+--
+ALTER TABLE `anope_ns_alias_metadata`
+  ADD CONSTRAINT `FK_anope_ns_alias_metadata_nick` FOREIGN KEY (`nick`) REFERENCES `anope_ns_alias` (`nick`) ON DELETE CASCADE ON UPDATE CASCADE;
+

data/nickserv.example.conf

@@ -1,637 +0,0 @@
-/*
- * Example configuration file for NickServ.
- */
-
-/*
- * First, create the service.
- */
-service
-{
-	/*
-	 * The name of the NickServ client
-	 */
-	nick = "NickServ"
-
-	/*
-	 * The username of the NickServ client.
-	 */
-	user = "services"
-
-	/*
-	 * The hostname of the NickServ client.
-	 */
-	host = "services.host"
-
-	/*
-	 * The realname of the NickServ client.
-	 */
-	gecos = "Nickname Registration Service"
-
-	/*
-	 * The modes this client should use.
-	 * Do not modify this unless you know what you are doing.
-	 *
-	 * These modes are very IRCd specific. If left commented, sane defaults
-	 * are used based on what protocol module you have loaded.
-	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
-	 * unable to do certain things if this option is enabled.
-	 */
-	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
-	 */
-	#channels = "@#services,#mychan"
-}
-
-/*
- * Core NickServ module.
- *
- * Provides essential functionality for NickServ.
- */
-module { name = "nickserv" }
-
-/*
- * Configuration for NickServ provided by ns_main.
- */
-nickserv
-{
-	/*
-	 * The name of the client that should be NickServ.
-	 */
-	name = "NickServ"
-
-	/*
-	 * Force users to give an e-mail address when they register a nick.
-	 * 
-	 * This directive is recommended to be enabled, and required if e-mail registration is enabled.
-	 */
-	forceemail = yes
-
-	/*
-	 * Require users who change their email address to confirm they
-	 * own it.
-	 */
-	confirmemailchanges = no
-
-	/*
-	 * Require an e-mail to be sent to the user before they can register their nick.
-	 */
-	#emailregistration = yes
-
-	/*
-	 * The default options for newly registered nicks. Note that changing these options
-	 * will have no effect on nicks which are already registered. The list must be separated
-	 * by spaces.
-	 *
-	 * The options are:
-	 * -         kill: Kill nick if not identified within 60 seconds
-	 * -    killquick: Kill nick if not identified within 20 seconds, this one overrides the above
-	 *                   option and the above must be specified with this one
-	 * -       secure: Enable nickname security, requiring the nick's password before any operations
-	 *                   can be done on it
-	 * -      private: Hide the nick from NickServ's LIST command
-	 * -    hideemail: Hide's the nick's e-mail address from NickServ's INFO command
-	 * - hideusermask: Hide's the nick's last or current user@host from NickServ's INFO command
-	 * -     hidequit: Hide's the nick's last quit message
-	 * -   memosignon: Notify user if they have a new memo when they sign into the nick
-	 * -  memoreceive: Notify user if they have a new memo as soon as it's received
-	 * -       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 UsePrivmsg
-	 *                   to be enabled as well
-	 *
-	 * This directive is optional, if left blank, the options will default to secure, memosignon, and
-	 * memoreceive. If you really want no defaults, use "none" by itself as the option.
-	 */
-	defaults="secure private hideemail hideusermask memosignon memoreceive autoop"
-
-	/*
-	 * 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.
-	 */
-	languages = "ca_ES de_DE el_GR es_ES fr_FR hu_HU it_IT nl_NL pl_PL pt_PT ru_RU tr_TR"
-
-	/*
-	 * Default language that non- and newly-registered nicks will receive messages in.
-	 * Leave empty to default to English.
-	 */
-	#defaultlanguage = "es_ES"
-
-	/*
-	 * The minimum length of time between consecutive uses of NickServ's REGISTER command. This
-	 * directive is optional, but recommended. If not set, this restriction will be disabled.
-	 */
-	regdelay = 30s
-
-	/*
-	 * The minimum length of time between consecutive uses of NickServ's RESEND command.
-	 *
-	 * This directive is optional, but recommended. If not set, this restriction will be disabled.
-	 */
-	resenddelay = 90s
-
-	/*
-	 * The length of time before a nick registration expires.
-	 *
-	 * This directive is optional, but recommended. If not set, the default is 21 days.
-	 */
-	expire = 21d
-
-	/*
-	 * The length of time before a suspended nick becomes unsuspended.
-	 *
-	 * This directive is optional. If not set, the default is to never.
-	 */
-	#suspendexpire = 90d
-
-	/*
-	 * The length of time a user using an unconfirmed account has
-	 * before the account will be released for general use again.
-	 *
-	 * This directive is only required if the e-mail registration option is enabled.
-	 */
-	#unconfirmedexpire = 1d
-
-	/*
-	 * The maximum number of nicks allowed in a group.
-	 *
-	 * This directive is optional, but recommended. If not set or set to 0, no limits will be applied.
-	 */
-	maxaliases = 16
-
-	/*
-	 * The maximum number of entries allowed on a nickname's access list.
-	 */
-	accessmax = 32
-
-	/*
-	 * The username (and possibly hostname) used for the fake user created when NickServ collides
-	 * a user. Should be in the user@host format.
-	 */
-	enforceruser = "enforcer"
-	enforcerhost = "localhost.net"
-
-	/*
-	 * The delay before a NickServ collided nick is released.
-	 */
-	releasetimeout = 1m
-
-	/*
-	 * Allow the use of the IMMED option in the NickServ SET KILL command.
-	 *
-	 * This directive is optional.
-	 */
-	#allowkillimmed = yes
-
-	/*
-	 * If set, the NickServ GROUP command won't allow any group change. This is recommended for
-	 * better performance and to protect against nick stealing, however users will have less
-	 * flexibility.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	#nogroupchange = yes
-
-	/*
-	 * The maximum number of nicks to be returned for a NickServ LIST command.
-	 */
-	listmax = 50
-
-	/*
-	 * When a user's nick is forcibly changed to enforce a "nick kill", their new nick will start
-	 * with this value. The rest will be made up of 6 or 7 digits.
-	 */
-	guestnickprefix = "Guest"
-
-	/*
-	 * Prevents the use of the ACCESS, DROP, FORBID, GETPASS, and SET PASSWORD commands by Services Admins
-	 * on other Services Admins or the Services Root(s).
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	secureadmins = yes
-
-	/*
-	 * If set, any user wanting to use the privileges of Services Root, Services Admin, or Services
-	 * Operator must have been logged as an IRC Operator with the /oper command.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	strictprivileges = yes
-
-	/*
-	 * If set, Services will set the channel modes a user has access to upon identifying, assuming
-	 * they are not already set.
-	 *
-	 * This directive is optional.
-	 */
-	modeonid = yes
-
-	/*
-	 * If set, Services 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
-
-	/*
-	 * The maximum number of channels a user can have on NickServ's AJOIN command.
-	 */
-	ajoinmax = 10
-}
-
-/*
- * Core NickServ commands.
- *
- * In Anope modules can provide (multiple) commands, each of which has a unique command name. Once these modules
- * are loaded you can then configure the commands to be added to any client you like with any name you like.
- *
- * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
- *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behaviour.
- */
-
-/* Give it a help command */
-command { service = "NickServ"; name = "HELP"; command = "generic/help"; }
-
-/*
- * ns_access
- *
- * Provides the command nickserv/access.
- *
- * Used for configuring what hosts have access to your account.
- */
-module { name = "ns_access" }
-command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }
-
-/*
- * ns_ajoin
- *
- * Provides the command nickserv/ajoin.
- *
- * Used for configuring channels to join once you identify.
- */
-module { name = "ns_ajoin" }
-command { service = "NickServ"; name = "AJOIN"; command = "nickserv/ajoin"; }
-
-/*
- * ns_alist
- *
- * Provides the command nickserv/alist.
- *
- * Used for viewing what channels you have access to.
- */
-module { name = "ns_alist" }
-command { service = "NickServ"; name = "ALIST"; command = "nickserv/alist"; }
-
-/*
- * ns_cert
- *
- * Provides the command nickserv/cert.
- *
- * Used for configuring your SSL certificate list, which can be used to automatically identify you.
- */
-module { name = "ns_cert" }
-command { service = "NickServ"; name = "CERT"; command = "nickserv/cert"; }
-
-/*
- * ns_drop
- *
- * Provides the command nickserv/drop.
- *
- * Used for unregistering names.
- */
-module { name = "ns_drop" }
-command { service = "NickServ"; name = "DROP"; command = "nickserv/drop"; }
-
-/*
- * ns_getemail
- *
- * Provides the command nickserv/getemail.
- *
- * Used for getting registered accounts by searching for emails.
- */
-module { name = "ns_getemail" }
-command { service = "NickServ"; name = "GETEMAIL"; command = "nickserv/getemail"; permission = "nickserv/getemail"; }
-
-/*
- * 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_ghost
- *
- * Provides the command nickserv/ghost.
- *
- * Used for disconnecting "ghost" sessions.
- */
-module { name = "ns_ghost" }
-command { service = "NickServ"; name = "GHOST"; command = "nickserv/ghost"; }
-
-/*
- * ns_group
- *
- * Provides the commands nickserv/group, nickserv/glist, and nickserv/ungroup.
- *
- * Used for controlling nick groups.
- */
-module { name = "ns_group" }
-command { service = "NickServ"; name = "GLIST"; command = "nickserv/glist"; }
-command { service = "NickServ"; name = "GROUP"; command = "nickserv/group"; }
-command { service = "NickServ"; name = "UNGROUP"; command = "nickserv/ungroup"; }
-
-/*
- * ns_identify
- *
- * Provides the command nickserv/identify.
- *
- * Used for identifying to accounts.
- */
-module { name = "ns_identify" }
-command { service = "NickServ"; name = "ID"; command = "nickserv/identify"; }
-command { service = "NickServ"; name = "IDENTIFY"; command = "nickserv/identify"; }
-
-/*
- * ns_info
- *
- * Provides the command nickserv/info.
- *
- * Used for gathering information about an account.
- */
-module { name = "ns_info" }
-command { service = "NickServ"; name = "INFO"; command = "nickserv/info"; }
-
-/*
- * ns_list
- *
- * Provides the command nickserv/list.
- *
- * Used for retrieving and searching the registered account list.
- */
-module { name = "ns_list" }
-command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; }
-
-/*
- * ns_logout
- *
- * Provides the command nickserv/logout.
- *
- * Used for logging out of your account.
- */
-module { name = "ns_logout" }
-command { service = "NickServ"; name = "LOGOUT"; command = "nickserv/logout"; }
-
-/*
- * ns_recover
- *
- * Provides the command nickserv/recover.
- *
- * Used for forcing someone on your nick to a guest nick.
- */
-module { name = "ns_recover" }
-command { service = "NickServ"; name = "RECOVER"; command = "nickserv/recover"; }
-
-/*
- * ns_register
- *
- * Provides the commands nickserv/confirm, nickserv/register, and nickserv/resend.
- *
- * Used for registering accounts.
- */
-module { name = "ns_register" }
-command { service = "NickServ"; name = "CONFIRM"; command = "nickserv/confirm"; }
-command { service = "NickServ"; name = "REGISTER"; command = "nickserv/register"; }
-command { service = "NickServ"; name = "RESEND"; command = "nickserv/resend"; }
-
-/*
- * ns_release
- *
- * Provides the command nickserv/release.
- *
- * Used for releasing names held by nickserv/recover.
- */
-module { name = "ns_release" }
-command { service = "NickServ"; name = "RELEASE"; command = "nickserv/release"; }
-
-/*
- * ns_resetpass
- *
- * Provides the command nickserv/resetpass.
- *
- * Used for resetting passwords by emailing users a temporary one.
- */
-module { name = "ns_resetpass" }
-command { service = "NickServ"; name = "RESETPASS"; command = "nickserv/resetpass"; }
-
-/*
- * ns_saset
- *
- * Provides commands nickserv/saset, nickserv/saset/password.
- *
- * Used as a help wrapper for SASET commands, and used to force change users password.
- */
-module { name = "ns_saset" }
-command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; }
-command { service = "NickServ"; name = "SASET PASSWORD"; command = "nickserv/saset/password"; }
-
-/*
- * ns_saset_noexpire
- *
- * Provides the command nickserv/saset/noexpire.
- *
- * Used for configuring noexpire, which prevents nicks from expiring.
- */
-module { name = "ns_saset_noexpire" }
-command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire" }
-
-/*
- * ns_set
- *
- * Provides the commands nickserv/set, nickserv/set/password.
- *
- * Used as a help wrapper for SET commands, and used for users to change their password.
- */
-module { name = "ns_set" }
-command { service = "NickServ"; name = "SET"; command = "nickserv/set"; }
-command { service = "NickServ"; name = "SET PASSWORD"; command = "nickserv/set/password"; }
-
-/*
- * ns_set_autoop
- *
- * Provides the commands nickserv/set/autoop and nickserv/saset/autoop.
- *
- * Used for setting autoop, which determines whether or not modes are automatically set on you when joining a channel.
- */
-module { name = "ns_set_autoop" }
-command { service = "NickServ"; name = "SET AUTOOP"; command = "nickserv/set/autoop"; }
-command { service = "NickServ"; name = "SASET AUTOOP"; command = "nickserv/saset/autoop"; permission = "nickserv/saset/autoop"; }
-
-/*
- * ns_set_display
- *
- * Provides the commands nickserv/set/display and nickserv/saset/display.
- *
- * Used for setting users display names.
- */
-module { name = "ns_set_display" }
-command { service = "NickServ"; name = "SET DISPLAY"; command = "nickserv/set/display"; }
-command { service = "NickServ"; name = "SASET DISPLAY"; command = "nickserv/saset/display"; permission = "nickserv/saset/display"; }
-
-/*
- * ns_set_email
- *
- * Provides the commands nickserv/set/email and nickserv/saset/email.
- *
- * Used for setting users email addresses.
- */
-module { name = "ns_set_email" }
-command { service = "NickServ"; name = "SET EMAIL"; command = "nickserv/set/email"; }
-command { service = "NickServ"; name = "SASET EMAIL"; command = "nickserv/saset/email"; permission = "nickserv/saset/email"; }
-
-/*
- * ns_set_greet
- *
- * Provides the commands nickserv/set/greet and nickserv/saset/greet.
- *
- * Used for changing users greet message, which is displayed when they enter channels.
- */
-module { name = "ns_set_greet" }
-command { service = "NickServ"; name = "SET GREET"; command = "nickserv/set/greet"; }
-command { service = "NickServ"; name = "SASET GREET"; command = "nickserv/saset/greet"; permission = "nickserv/saset/greet"; }
-
-/*
- * ns_set_hide
- *
- * Provides the commands nickserv/set/hide and nickserv/saset/hide.
- *
- * Used for configuring which options are publically shown in nickserv/info for your account.
- */
-module { name = "ns_set_hide" }
-command { service = "NickServ"; name = "SET HIDE"; command = "nickserv/set/hide"; }
-command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; }
-
-/*
- * ns_set_kill
- *
- * Provides the commands nickserv/set/kill and nickserv/saset/kill.
- *
- * Used for configuring if and for how long other users are allowed to use your nick.
- */
-module { name = "ns_set_kill" }
-command { service = "NickServ"; name = "SET KILL"; command = "nickserv/set/kill"; }
-command { service = "NickServ"; name = "SASET KILL"; command = "nickserv/saset/kill"; permission = "nickserv/saset/kill"; }
-
-/*
- * ns_set_language
- *
- * Provides the commands nickserv/set/language and nickserv/saset/language.
- *
- * Used for configuring what language services use when messaging you.
- */
-module { name = "ns_set_language" }
-command { service = "NickServ"; name = "SET LANGUAGE"; command = "nickserv/set/language"; }
-command { service = "NickServ"; name = "SASET LANGUAGE"; command = "nickserv/saset/language"; permission = "nickserv/saset/language"; }
-
-/*
- * ns_set_message
- *
- * Provides the commands nickserv/set/message and nickserv/saset/message.
- *
- * Used to configure how services send messages to you.
- */
-module { name = "ns_set_message" }
-command { service = "NickServ"; name = "SET MESSAGE"; command = "nickserv/set/message"; }
-command { service = "NickServ"; name = "SASET MESSAGE"; command = "nickserv/saset/message"; permission = "nickserv/saset/message"; }
-
-/*
- * ns_set_private
- *
- * Provides the commands nickserv/set/private and nickserv/saset/private.
- *
- * Used for configuring whether or not your account shows up in nickserv/list.
- */
-module { name = "ns_set_private" }
-command { service = "NickServ"; name = "SET PRIVATE"; command = "nickserv/set/private"; }
-command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; }
-
-/*
- * ns_set_secure
- *
- * Provides the commands nickserv/set/secure and nickserv/saset/secure.
- *
- * Used for configuring whether you can gain access to your nick by simply being recognized by nickserv/access.
- */
-module { name = "ns_set_secure" }
-command { service = "NickServ"; name = "SET SECURE"; command = "nickserv/set/secure"; }
-command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset/secure"; permission = "nickserv/saset/secure"; }
-
-/*
- * ns_sendpass
- *
- * Provides the command nickserv/sendpass.
- *
- * Used to send users their password via email.
- *
- * Requires that no encryption is being used.
- */
-module { name = "ns_sendpass" }
-command { service = "NickServ"; name = "SENDPASS"; command = "nickserv/sendpass"; permission = "nickserv/sendpass"; }
-
-/*
- * ns_set_misc
- *
- * Provides the command nickserv/set/misc.
- *
- * Allows you to create arbitrary commands to set data, and have that data show up in nickserv/info.
- */
-module { name = "ns_set_misc" }
-command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; }
-command { service = "NickServ"; name = "SET ICQ"; command = "nickserv/set/misc"; }
-
-/*
- * ns_status
- *
- * Provides the nickserv/status command.
- *
- * Used to determine if a user is recognized or identified by services.
- */
-module { name = "ns_status" }
-command { service = "NickServ"; name = "STATUS"; command = "nickserv/status"; }
-
-/*
- * ns_suspend
- *
- * Provides the commands nickserv/suspend and nickserv/unsuspend.
- *
- * Used to suspend and unsuspend nicknames. Suspended nicknames can not be used but their settings are stored.
- */
-module { name = "ns_suspend" }
-command { service = "NickServ"; name = "SUSPEND"; command = "nickserv/suspend"; permission = "nickserv/suspend"; }
-command { service = "NickServ"; name = "UNSUSPEND"; command = "nickserv/unsuspend"; permission = "nickserv/suspend"; }
-
-/*
- * ns_update
- *
- * Provides the command nickserv/update.
- *
- * Used to update your status on all channels, turn on your vHost, etc.
- */
-module { name = "ns_update" }
-command { service = "NickServ"; name = "UPDATE"; command = "nickserv/update"; }
-

data/operserv.example.conf

@@ -1,606 +0,0 @@
-/*
- * Example configuration file for OperServ.
- */
-
-/*
- * First, create the service.
- */
-service
-{
-	/*
-	 * The name of the OperServ client
-	 */
-	nick = "OperServ"
-
-	/*
-	 * The username of the OperServ client.
-	 */
-	user = "services"
-
-	/*
-	 * The hostname of the OperServ client.
-	 */
-	host = "services.host"
-
-	/*
-	 * The realname of the OperServ client.
-	 */
-	gecos = "Operator Service"
-
-	/*
-	 * The modes this client should use.
-	 * Do not modify this unless you know what you are doing.
-	 *
-	 * These modes are very IRCd specific. If left commented, sane defaults
-	 * are used based on what protocol module you have loaded.
-	 *
-	 * Note that setting this option incorrectly could potentially BREAK some if
-	 * not all usefulness of the client. We will not support you if this client is
-	 * unable to do certain things if this option is enabled.
-	 */
-	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode character or prefix symbol.
-	 */
-	#channels = "@#services,#mychan"
-}
-
-/*
- * Core OperServ module.
- *
- * Provides essential functionality for OperServ.
- */
-module { name = "operserv" }
-
-/*
- * Configuration for OperServ provided by os_main.
- */
-operserv
-{
-	/*
-	 * The name of the client that should be OperServ.
-	 */
-	name = "OperServ"
-
-	/*
-	 * If set, Services Admins will be able to use SUPERADMIN [ON|OFF] which will temporarily grant
-	 * them extra privileges such as being a founder on ALL channels.
-	 *
-	 * This directive is optional.
-	 */
-	#superadmin = yes
-
-	/*
-	 * These define the default expiration times for, respectively, AKILLs, CHANKILLs, SNLINEs,
-	 * and SQLINEs.
-	 */
-	autokillexpiry = 30d
-	chankillexpiry = 30d
-	snlineexpiry = 30d
-	sqlineexpiry = 30d
-	szlineexpiry = 30d
-
-	/*
-	 * If set, this option will make Services 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.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	akillonadd = yes
-
-	/*
-	 * If set, this option will make Services 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.
-	 */
-	#killonsnline = yes
-
-	/*
-	 * If set, this option will make Services 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.
-	 */
-	#killonsqline = yes
-
-	/*
-	 * Defines what actions should trigger notifications. The list must be separated by spaces.
-	 *
-	 * The notifications are:
-	 * -            oper: A user has become an IRC operator
-	 * -           bados: A non-IRCop attempts to use OperServ
-	 * -     akillexpire: An AKILL has expired
-	 * -    snlineexpire: An SNLINE has expired
-	 * -    sqlineexpire: An SQLINE has expired
-	 * - exceptionexpire: A session exception has expired
-	 *
-	 * This directive is optional, if left blank, there will be no notifications.
-	 */
-	notifications = "oper"
-
-	/*
-	 * Enables session limiting. Session limiting prevents users from connecting more than a certain
-	 * number of times from the same host 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
-	 * be killed. Exceptions to the default session limit can be defined via the exception list. It
-	 * should be noted that session limiting, along with a large exception list, can degrade Services'
-	 * performance.
-	 *
-	 * See the online help for more information about session limiting.
-	 *
-	 * This directive is optional.
-	 */
-	limitsessions = yes
-
-	/*
-	 * Default session limit per host. Once a host reaches it's session limit, all clients attempting
-	 * to connect from that host will be killed. A value of zero means an unlimited session limit.
-	 *
-	 * This directive is optional.
-	 * If not given and session limiting is enabled, it will default to no limit.
-	 */
-	defaultsessionlimit = 3
-
-	/*
-	 * The maximum session limit that may be set for a host in an exception.
-	 *
-	 * This directive is only required if session limiting is enabled.
-	 */
-	maxsessionlimit = 100
-
-	/*
-	 * Sets the default expiry time for session exceptions.
-	 *
-	 * This directive is only required if session limiting is enabled.
-	 */
-	exceptionexpiry = 1d
-
-	/*
-	 * The message that will be NOTICE'd to a user just before they are removed from the network because
-	 * their host's session limit has been exceeded. It may be used to give a slightly more descriptive
-	 * reason for the impending kill as opposed to simply "Session limit exceeded".
-	 *
-	 * This directive is optional, if not set, nothing will be sent.
-	 */
-	sessionlimitexceeded = "The session limit for your host %s has been exceeded."
-
-	/*
-	 * Same as above, but should be used to provide a website address where users can find out more
-	 * about session limits and how to go about applying for an exception.
-	 *
-	 * Note: This directive has been intentionally commented out in an effort to remind you to change
-	 * the URL it contains. It is recommended that you supply an address/URL where people can get help
-	 * regarding session limits.
-	 *
-	 * This directive is optional, if not set, nothing will be sent.
-	 */
-	#sessionlimitdetailsloc = "Please visit http://your.website.url/ for more information about session limits."
-
-	/*
-	 * If set and is not 0, this directive tells Services to add an AKILL the number of subsequent kills
-	 * for the same host exceeds this value, preventing the network from experiencing KILL floods.
-	 *
-	 * This directive is optional.
-	 */
-	maxsessionkill = 15
-
-	/*
-	 * Sets the expiry time for AKILLs set for hosts exceeding the maxsessionkill directive limit.
-	 *
-	 * This directive is optional, if not set, defaults to 30 minutes.
-	 */
-	sessionautokillexpiry = 30m
-
-	/*
-	 * Adds the nickname of the IRC Operator issuing an AKILL to the kill reason.
-	 *
-	 * This directive is optional.
-	 */
-	addakiller = yes
-
-	/*
-	 * Adds akill IDs to akills. Akill IDs are given to users in their ban reason and can be used to easily view,
-	 * modify, or remove an akill from the ID.
-	 */
-	akillids = yes
-
-	/*
-	 * If set, only IRC Operators will be permitted to use OperServ, regardless of module-based command
-	 * access restrictions.
-	 *
-	 * This directive is optional, but recommended.
-	 */
-	opersonly = yes
-}
-
-/*
- * Core OperServ commands.
- *
- * In Anope modules can provide (multiple) commands, each of which has a unique command name. Once these modules
- * are loaded you can then configure the commands to be added to any client you like with any name you like.
- *
- * Additionally, you may provide a permission name that must be in the opertype of users executing the command.
- *
- * Sane defaults are provided below that do not need to be edited unless you wish to change the default behavior.
- */
-
-/* Give it a help command */
-command { service = "OperServ"; name = "HELP"; command = "generic/help"; }
-
-/*
- * os_akill
- *
- * Provides the command operserv/akill.
- *
- * Used to ban users from the network.
- */
-module { name = "os_akill" }
-command { service = "OperServ"; name = "AKILL"; command = "operserv/akill"; permission = "operserv/akill"; }
-
-/*
- * os_chankill
- *
- * Provides the command operserv/chankill.
- *
- * Used to akill users from an entire channel.
- */
-module { name = "os_chankill" }
-command { service = "OperServ"; name = "CHANKILL"; command = "operserv/chankill"; permission = "operserv/chankill"; }
-
-/*
- * os_defcon
- *
- * Provides the command operserv/defcon.
- *
- * Allows you to set services in defcon mode, which can be used to restrict services access
- * during bot attacks.
- */
-#module { name = "os_defcon" }
-#command { service = "OperServ"; name = "DEFCON"; command = "operserv/defcon"; }
-defcon
-{
-	/*
-	 * Default DefCon level (1-5) to use when starting Services 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.
-	 */
-	#defaultlevel = 5
-
-	/*
-	 * The following 4 directives define what operations will take place when DefCon is set to levels
-	 * 1 through 4. Each level is a list that must be separated by spaces.
-	 *
-	 * The following operations can be defined at each level:
-	 * - nonewchannels: Disables registering new channels
-	 * - nonewnicks: Disables registering new nicks
-	 * - nomlockchanges: Disables changing MLOCK on registered channels
-	 * - 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
-	 * - akillnewclients: AKILL any new clients trying to connect
-	 * - nonewmemos: No new memos will be sent to block MemoServ attacks
-	 */
-	level4 = "nonewchannels nonewnicks nomlockchanges reducedsessions"
-	level3 = "nonewchannels nonewnicks nomlockchanges forcechanmodes reducedsessions"
-	level2 = "nonewchannels nonewnicks nomlockchanges forcechanmodes reducedsessions silentoperonly"
-	level1 = "nonewchannels nonewnicks nomlockchanges forcechanmodes reducedsessions silentoperonly akillnewclients"
-
-	/*
-	 * New session limit to use when a DefCon level is using "reduced" session limiting.
-	 */
-	#sessionlimit = 2
-
-	/*
-	 * Length of time to add an AKILL for when DefCon is preventing new clients from connecting to the
-	 * network.
-	 */
-	#akillexpire = 5m
-
-	/*
-	 * 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
-	 * 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 with -k.
-	 *
-	 * Note 2: MLOCKed modes will not be lost.
-	 */
-	#chanmodes = "+R"
-
-	/*
-	 * This value can be used to automatically return the network to DefCon level 5 after the specified
-	 * time period, just in case any IRC Operator forgets to remove a DefCon setting.
-	 *
-	 * This directive is optional.
-	 */
-	#timeout = 15m
-
-	/*
-	 * If set, Services 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
-	 * changes.
-	 *
-	 * This directive is optional.
-	 */
-	#globalondefconmore = yes
-
-	/*
-	 * Defines the message that will be sent on DefCon level changes when globalondefconmore is set.
-	 *
-	 * This directive is required only when globalondefconmore is set.
-	 */
-	#message = "Put your message to send your users here. Dont forget to uncomment globalondefconmore"
-
-	/*
-	 * Defines the message that will be sent when DefCon is returned to level 5. This directive is optional,
-	 * and will also override globalondefcon and globalondefconmore when set.
-	 */
-	#offmessage = "Services are now back to normal, sorry for any inconvenience"
-
-	/*
-	 * Defines the reason to use when clients are KILLed or AKILLed from the network while the proper
-	 * DefCon operation is in effect.
-	 */
-	#akillreason = "This network is currently not accepting connections, please try again later"
-}
-
-/*
- * os_list
- *
- * Provides the commands operserv/chanlist and operserv/userlist.
- *
- * Used to list and search the channels and users currently on the network.
- */
-module { name = "os_list" }
-command { service = "OperServ"; name = "CHANLIST"; command = "operserv/chanlist"; }
-command { service = "OperServ"; name = "USERLIST"; command = "operserv/userlist"; }
-
-/*
- * os_config
- *
- * Provides the command operserv/config.
- *
- * Used to view and set configuration options while services are running.
- */
-module { name = "os_config" }
-command { service = "OperServ"; name = "CONFIG"; command = "operserv/config"; permission = "operserv/config"; }
-
-/*
- * os_forbid
- *
- * Provides the command operserv/forbid.
- *
- * Used to forbid specific nicks, channels, emails, etc. from being used.
- */
-module { name = "os_forbid" }
-command { service = "OperServ"; name = "FORBID"; command = "operserv/forbid"; permission = "operserv/forbid"; }
-
-/*
- * os_ignore
- *
- * Provides the command operserv/ignore.
- *
- * Used to make Services ignore users.
- */
-module { name = "os_ignore" }
-command { service = "OperServ"; name = "IGNORE"; command = "operserv/ignore"; permission = "operserv/ignore"; }
-
-/*
- * os_jupe
- *
- * Provides the command operserv/jupe.
- *
- * Used to disconnect servers from the network and prevent them from relinking.
- */
-module { name = "os_jupe" }
-command { service = "OperServ"; name = "JUPE"; command = "operserv/jupe"; permission = "operserv/jupe"; }
-
-/*
- * os_kick
- *
- * Provides the command operserv/kick.
- *
- * Used to kick users from channels.
- */
-module { name = "os_kick" }
-command { service = "OperServ"; name = "KICK"; command = "operserv/kick"; permission = "operserv/kick"; }
-
-/*
- * os_kill
- *
- * Provides the command operserv/kill.
- *
- * Used to forcibly disconnect users from the network.
- */
-module { name = "os_kill" }
-command { service = "OperServ"; name = "KILL"; command = "operserv/kill"; permission = "operserv/kill"; }
-
-/*
- * os_login
- *
- * Provides the commands operserv/login and operserv/logout.
- *
- * Used to login to OperServ, only required if your oper block requires this.
- */
-module { name = "os_login" }
-command { service = "OperServ"; name = "LOGIN"; command = "operserv/login"; }
-command { service = "OperServ"; name = "LOGOUT"; command = "operserv/logout"; }
-
-/*
- * os_mode
- *
- * Provides the commands operserv/mode and operserv/umode.
- *
- * Used to change user and channel modes.
- */
-module { name = "os_mode" }
-command { service = "OperServ"; name = "MODE"; command = "operserv/mode"; permission = "operserv/mode"; }
-command { service = "OperServ"; name = "UMODE"; command = "operserv/umode"; permission = "operserv/umode"; }
-
-/*
- * os_modinfo
- *
- * Provides the commands operserv/modinfo and operserv/modlist.
- *
- * Used to show information about loaded modules.
- */
-module { name = "os_modinfo" }
-command { service = "OperServ"; name = "MODINFO"; command = "operserv/modinfo"; }
-command { service = "OperServ"; name = "MODLIST"; command = "operserv/modlist"; permission = "operserv/modlist"; }
-
-/*
- * os_module
- *
- * Provides the commands operserv/modload, operserv/modreload, and operserv/modunload.
- *
- * Used to load, reload, and unload modules.
- */
-module { name = "os_module" }
-command { service = "OperServ"; name = "MODLOAD"; command = "operserv/modload"; permission = "operserv/modload"; }
-command { service = "OperServ"; name = "MODRELOAD"; command = "operserv/modreload"; permission = "operserv/modload"; }
-command { service = "OperServ"; name = "MODUNLOAD"; command = "operserv/modunload"; permission = "operserv/modload"; }
-
-/*
- * os_news
- *
- * Provides the commands operserv/logonnews, operserv/opernews, and operserv/randomnews.
- *
- * Used to configure news notices shown to users when they connect, and opers when they oper.
- */
-module { name = "os_news" }
-command { service = "OperServ"; name = "LOGONNEWS"; command = "operserv/logonnews"; permission = "operserv/news"; }
-command { service = "OperServ"; name = "OPERNEWS"; command = "operserv/opernews"; permission = "operserv/news"; }
-command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomnews"; permission = "operserv/news"; }
-
-/*
- * os_noop
- *
- * Provides the command operserv/noop.
- *
- * Used to NOOP a server, which prevents users from opering on that server.
- */
-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
- * 
- * Provides the command operserv/oper.
- *
- * Used to configure opers and show information about opertypes.
- */
-module { name = "os_oper" }
-command { service = "OperServ"; name = "OPER"; command = "operserv/oper"; permission = "operserv/oper"; }
-
-/*
- * os_reload
- *
- * Provides the command operserv/relad.
- *
- * Used to reload the services.conf configuration file.
- */
-module { name = "os_reload" }
-command { service = "OperServ"; name = "RELOAD"; command = "operserv/reload"; permission = "operserv/reload"; }
-
-/*
- * os_session
- *
- * Provides the commands operserv/exception and operserv/session.
- *
- * Used to manage the session limit exception list, and view currently active sessions.
- */
-module { name = "os_session" }
-command { service = "OperServ"; name = "EXCEPTION"; command = "operserv/exception"; permission = "operserv/exception"; }
-command { service = "OperServ"; name = "SESSION"; command = "operserv/session"; permission = "operserv/session"; }
-
-/*
- * os_set
- *
- * Provides the command operserv/set.
- *
- * Used to set various settings such as superadmin, debug mode, etc.
- */
-module { name = "os_set" }
-command { service = "OperServ"; name = "SET"; command = "operserv/set"; permission = "operserv/set"; }
-
-/*
- * os_shutdown
- *
- * Provides the commands operserv/quit, operserv/restart, and operserv/shutdown.
- *
- * Used to quit, restart, or shutdown services.
- */
-module { name = "os_shutdown" }
-command { service = "OperServ"; name = "QUIT"; command = "operserv/quit"; permission = "operserv/quit"; }
-command { service = "OperServ"; name = "RESTART"; command = "operserv/restart"; permission = "operserv/restart"; }
-command { service = "OperServ"; name = "SHUTDOWN"; command = "operserv/shutdown"; permission = "operserv/shutdown"; }
-
-/*
- * os_stats
- *
- * Provides the operserv/stats command.
- *
- * Used to show statistics about services.
- */
-module { name = "os_stats" }
-command { service = "OperServ"; name = "STATS"; command = "operserv/stats"; permission = "operserv/stats"; }
-
-/*
- * os_svsnick
- * 
- * Provides the operserv/svsnick command.
- *
- * Used to force change user's nicks.
- */
-module { name = "os_svsnick" }
-command { service = "OperServ"; name = "SVSNICK"; command = "operserv/svsnick"; permission = "operserv/svsnick"; }
-
-/*
- * os_sxline
- *
- * Provides the operserv/snline and operserv/sqline commands.
- *
- * Used to ban different things such as realnames, nicknames, and IPs.
- */
-module { name = "os_sxline" }
-command { service = "OperServ"; name = "SNLINE"; command = "operserv/snline"; permission = "operserv/snline"; }
-command { service = "OperServ"; name = "SQLINE"; command = "operserv/sqline"; permission = "operserv/sqline"; }
-
-/*
- * os_update
- *
- * Provides the opersev/update command.
- *
- * Use to immediately update the databases.
- */
-module { name = "os_update" }
-command { service = "OperServ"; name = "UPDATE"; command = "operserv/update"; permission = "operserv/update"; }
-

data/version.log

@@ -1,391 +1,28 @@
-Revision 378ae4c - Fri, 3 Feb 2012 15:18:06 -0500 - Regenerate language files
-Revision ce2a0f7 - Tue, 31 Jan 2012 16:19:47 -0500 - Fixed a memory leak in m_ldap
-Revision be5ba49 - Tue, 31 Jan 2012 15:44:04 -0500 - Not sure what I was thinking here
-Revision b4f27da - Tue, 31 Jan 2012 15:35:51 -0500 - Bug #1365 - Fixed nickserv/confirm syntax for services opers
-Revision d09a302 - Thu, 26 Jan 2012 17:04:59 -0500 - Also refuse to load memoserv modules if memoserv isn't loaded
-Revision 0f90927 - Wed, 25 Jan 2012 16:13:38 -0500 - Added two common warning messages on Windows to ignore
-Revision 52eaa7d - Wed, 25 Jan 2012 15:48:07 -0500 - Windows
-Revision e88e37c - Tue, 24 Jan 2012 18:28:37 -0500 - Add some checks in ms_* to make sure memoserv really exists
-Revision f10f49d - Tue, 24 Jan 2012 16:42:21 -0500 - Added missing expires column in /os akill view
-Revision d06cdaa - Tue, 24 Jan 2012 16:35:54 -0500 - Fixed os_ignore to check against users real IPs, not to match against opers, and check for expired ignores on /os ignore list
-Revision fc20bd7 - Tue, 24 Jan 2012 16:03:44 -0500 - Add tracking for Unreal's usermode +I
-Revision b3d9412 - Sun, 22 Jan 2012 17:49:23 +0100 - added a french INSTALL file, thanks to MacLeod for translating
-Revision 98feb1b - Sat, 21 Jan 2012 00:50:48 -0500 - Cleaned up bs_kick and fixed amsg kicker
-Revision 94c302b - Fri, 20 Jan 2012 20:50:36 +0000 - Fixed param check from last commit
-Revision cdb6bb8 - Fri, 20 Jan 2012 17:50:09 +0000 - Updated DEFCON and fixed Defcons disabling of the removed mlock command
-Revision a851f84 - Fri, 20 Jan 2012 15:03:49 +0000 - Corrected some incorrect English
-Revision a270a13 - Sun, 15 Jan 2012 02:59:09 -0500 - Fixed crash from last commit
-Revision 964d63c - Sun, 15 Jan 2012 01:47:31 -0500 - Improve on db_sql_live_read
-Revision f38faed - Sat, 14 Jan 2012 15:58:51 +0000 - Fixed an incorrect crash-causing response when an invalid option is specified in botservs kickers
-Revision c462a69 - Fri, 13 Jan 2012 15:37:17 -0500 - Only match users nicks against access list entries if the entry is a mask... accidentally removed from an earlier fix for #1368
-Revision 14a2c9c - Wed, 11 Jan 2012 19:04:40 -0500 - Fixed loading db_sql_live_read's configuration values on startup
-Revision a52ed70 - Tue, 10 Jan 2012 17:58:56 -0500 - Don't ever attempt to process CTCPs as regular messages
-Revision 7c03e60 - Tue, 10 Jan 2012 17:53:48 -0500 - Removed this "valid" ip check in cidr::cidr, is wrong for IPv6 and ::pton checks this anyway using inet_pton. Also fixed a comment Robby broke in chanserv.conf
-Revision 1e9d88a - Tue, 10 Jan 2012 17:06:08 -0500 - Add support for Unreals extban ~a:
-Revision 815e140 - Sun, 8 Jan 2012 19:42:48 -0500 - Fixed loading akill reasons
-Revision f824557 - Sun, 8 Jan 2012 18:14:07 -0500 - Fixed topic lock on inspircd
-Revision 830c5ca - Sat, 7 Jan 2012 16:21:31 -0500 - Cleanup of cs_tban
-Revision 9e71394 - Sat, 7 Jan 2012 04:10:30 -0500 - Cleaned up a lot of log messages, help replies, fixed cs_tban, and other small fixes
-Revision dd64eac - Sat, 7 Jan 2012 03:44:43 -0500 - Fixed users not being able to delete their own access with /cs access when using numbers, and clean up cs_xop slightly
-Revision 4204ece - Mon, 2 Jan 2012 21:28:24 -0500 - Updated Copyright to 2012
-Revision 60a5cc1 - Sat, 31 Dec 2011 03:04:44 -0500 - Bug #1369 - Fixed os_svsnick to allow changing the case of a users' nick
-Revision 20aa4e8 - Sat, 31 Dec 2011 01:33:32 -0500 - Bug #1368 - check all members of a users gruop against the access list
-Revision f1b05ac - Wed, 28 Dec 2011 12:49:04 -0500 - Fixed this back now unreal sends 0 for non logged in users
-Revision a4bf770 - Wed, 28 Dec 2011 04:31:44 -0500 - Added ESVID support to unreal32 Also fixes a crash due to unreal's ESVID change when users connect.
-Revision 150831c - Tue, 27 Dec 2011 23:11:14 -0500 - Made capab management a bit simplier
-Revision 1a4157b - Fri, 23 Dec 2011 12:29:30 -0500 - Add DT_ALLOW_EMPTY config flag, allow fantasychars to be empty
-Revision 3bcb285 - Thu, 22 Dec 2011 03:46:35 -0500 - Somehow these two modules got mixed up..
-Revision 704dbe2 - Tue, 20 Dec 2011 18:38:37 -0500 - Updated /bs info output and note db_sql can truncate entire databases
-Revision bbddf50 - Mon, 19 Dec 2011 17:13:38 -0500 - Fixed botserv kickers
-Revision e5851ad - Mon, 19 Dec 2011 16:07:28 -0500 - Fixed saving databases with MySQL when shut down by SIGINT
-Revision 03119f2 - Mon, 19 Dec 2011 15:41:14 -0500 - Made m_dnsbl ban IPs not hostnames
-Revision 45fc3ce - Mon, 19 Dec 2011 15:37:15 -0500 - Fixed formatting of many lists and INFO outputs
-Revision d320c73 - Sat, 17 Dec 2011 10:30:13 +0000 - Fixed entry messages not displaying.
-Revision ca8ce89 - Sat, 17 Dec 2011 02:06:53 +0000 - Fixed a slight error in email registration/resend and some minor typos.
-Revision c88a751 - Thu, 15 Dec 2011 02:29:13 -0500 - Add privilege ranks to determine how powerful privileges are
-Revision 9ea030d - Thu, 15 Dec 2011 01:14:13 -0500 - Fixed access comparators
-Revision ad14c81 - Mon, 12 Dec 2011 15:37:08 -0500 - Update channel last used times when founders use the channel, too
-Revision 255a8da - Mon, 12 Dec 2011 15:26:59 -0500 - Added oper:require_oper configuration option
-Revision 4211dcf - Sun, 11 Dec 2011 17:03:33 -0500 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision 3c5337f - Sun, 11 Dec 2011 17:01:56 -0500 - Fixed translating messages with varargs sent directly to users, too
-Revision d2f788c - Sun, 11 Dec 2011 05:17:19 +0000 - Added K to vhost_chars...
-Revision fa54d5a - Thu, 8 Dec 2011 17:29:17 -0500 - Fixed a memory leak in m_sqlite
-Revision aeefe16 - Mon, 5 Dec 2011 11:52:40 -0500 - Bug #1364 - fixed crash in /cs kick
-Revision c80e784 - Sat, 3 Dec 2011 19:17:41 -0500 - Attempt to fix issue with modules having their link libraries in the wrong order.
-Revision 620c08b - Fri, 25 Nov 2011 23:12:23 +0000 - Fixed some more errors in sql live-write, hopefully the last.
-Revision 23a9270 - Fri, 25 Nov 2011 23:10:26 +0000 - Fixed a crash in ns saset when using mysql-write module
-Revision cef3eb7 - Fri, 25 Nov 2011 00:44:31 -0500 - Remove send_cmd and replace it with a stringstream
-Revision 12d0a73 - Mon, 21 Nov 2011 16:24:45 -0500 - Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
-Revision 0dd85f7 - Mon, 21 Nov 2011 16:17:17 -0500 - Fixed not translating messages using varargs
-Revision 51d6e8e - Sun, 20 Nov 2011 18:41:46 -0500 - CMake handles strings and lists differently, so this should hopefully finally fix the linking issue.
-Revision 3f14882 - Sun, 20 Nov 2011 18:34:13 -0500 - Apparently pstdint.h was NOT included way back with commit 377a7a9 to use something similar to stdint.h
-Revision 5a17b06 - Sun, 20 Nov 2011 18:32:47 -0500 - Really fix linking in libraries (even if gettext isn't found on *nix), and a minor nitpick about the leading spaces on LINK_LIBS.
-Revision bf8e4ac - Sun, 20 Nov 2011 16:09:59 -0500 - Attempt to fix where link libraries are set when compiling to fix failed builds on systems that require -ldl.
-Revision 781ed11 - Sun, 20 Nov 2011 15:31:01 -0500 - Allow services operators to modify other users access list
-Revision 6f8f749 - Fri, 18 Nov 2011 16:20:17 -0500 - Allow kicking and banning by mask
-Revision c43cdf4 - Fri, 18 Nov 2011 11:22:01 -0500 - Added operserv/logout
-Revision 8374211 - Fri, 18 Nov 2011 00:36:54 -0500 - Allow having multiple fantasy characters
-Revision 69dfc72 - Thu, 17 Nov 2011 12:46:18 -0500 - Fixed storing mode locks
-Revision 5281282 - Wed, 16 Nov 2011 16:22:58 -0500 - Fixed compile error
-Revision 503eb42 - Tue, 15 Nov 2011 16:30:31 -0500 - Made looking up a level for a nonexistant privilege debugg log a warning, not abort
-Revision 38d90c7 - Tue, 15 Nov 2011 16:27:32 -0500 - Fixed loading ssl certs for users
-Revision 1356498 - Tue, 15 Nov 2011 16:22:02 -0500 - Prevent locking mode Z on unrealircd
-Revision 9ed203c - Tue, 15 Nov 2011 16:16:38 -0500 - Fixed crash on shutdown & a compiler warning
-Revision b5ff856 - Tue, 8 Nov 2011 17:29:16 -0500 - Windows
-Revision 97b9055 - Sat, 5 Nov 2011 15:05:15 -0400 - Remove xlines from the IRCd aswell as from our list when the clear command is used, and fixed adding timed Zlines to inspircd
-Revision 5f0b933 - Sat, 5 Nov 2011 00:11:49 -0400 - Set proper expirys on ZLines if the IRCd supports it
-Revision b3194a1 - Fri, 4 Nov 2011 19:39:27 -0400 - Updated Changes
-Revision d01f4ea - Fri, 4 Nov 2011 18:04:12 -0400 - Allow /os userlist to match host and ip too
-Revision a42cafb - Fri, 4 Nov 2011 17:55:14 -0400 - Store flags for memos, fixed the expiring very soon message, fixed /os session view when a session exception is added at a lower limit than th default
-Revision 066e5b3 - Fri, 4 Nov 2011 02:28:21 -0400 - Delete all tables before flushing not just ones we know about
-Revision 09dba47 - Thu, 3 Nov 2011 18:59:51 -0400 - Added an assignment operator for Serializable because some STL containers use it which causes iterators to become invalidated
-Revision ca33ac6 - Thu, 3 Nov 2011 02:28:29 -0400 - Bug #1354 - Allow mode chars to be used for channel prefixs in services.conf
-Revision 302989b - Tue, 1 Nov 2011 01:11:26 -0400 - Clarify the message when users try to lock modes they don't have access to lock
-Revision 22b7d9f - Tue, 1 Nov 2011 00:15:28 -0400 - Added a copy constructor to dynamic_reference to allow references to reference other references correctly
-Revision 9dd71c4 - Sat, 29 Oct 2011 21:16:50 -0400 - Fixed the signal/fork/wait mess hopefully once and for all. fork() did not copy kqueue descriptors on freebsd which caused problems
-Revision 655c1cc - Thu, 27 Oct 2011 18:21:49 -0400 - Fix a few warnings that only showed up with gcc 3.4.6 here (sadly, there is one on every file about anonymous variadic macros that I can't get rid of).
-Revision d9333e0 - Thu, 27 Oct 2011 18:01:56 -0400 - Clear flags before rebuilding them from the databases. Fixes bug #1351 where default flags would always be set when unserializing objects.
-Revision 39ac438 - Thu, 27 Oct 2011 15:09:31 -0400 - Ignore sigchld/usr2 sent to the child process after fork
-Revision 0761a4a - Thu, 27 Oct 2011 14:46:20 -0400 - Bug #1350 + other related fixes
-Revision 66ca256 - Thu, 27 Oct 2011 13:50:32 -0400 - Fixed loading exceptions in db_plain
-Revision 961bb6e - Thu, 27 Oct 2011 00:13:00 +0100 - Fixed some typos/errors in the example configs comments.
-Revision b14f5ea - Wed, 26 Oct 2011 16:52:00 -0400 - Fixed accidentally clearing botmodes when joins are sent
-Revision bf66336 - Wed, 26 Oct 2011 15:29:45 -0400 - Bug #1347, fixed incorrect param parsing in cs_set_misc
-Revision c79a575 - Wed, 26 Oct 2011 15:17:05 -0400 - Bug #1348 - Fixed /cs entrymsg list
-Revision 8334128 - Wed, 26 Oct 2011 14:31:58 -0400 - Removed the old unordered_map code
-Revision 7c62de1 - Mon, 24 Oct 2011 16:37:29 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision 377a7a9 - Mon, 24 Oct 2011 16:32:29 -0400 - Fixed bug #1349 (m_sqlite compiles without error under FreeBSD), as well as use C99's stdint.h (or cstdint if available) to get (u)intX_t types instead of our stupid typedefs.  pstdint.h included in case there is no cstdint or stdint.h available.
-Revision ccf29c0 - Mon, 24 Oct 2011 13:19:51 -0400 - Fixed the capab parser to parse capab tokens prefixed with :. Fixes not detecting quitstorm support on ratbox
-Revision d0513d6 - Sat, 22 Oct 2011 16:11:26 -0400 - A few minor fixups
-Revision f4a0bdd - Sat, 22 Oct 2011 12:45:55 -0400 - Added our own eventfd test for openvz machines which have eventfd but can not be used
-Revision 3e2ac36 - Sat, 22 Oct 2011 11:35:31 -0400 - Bug #1343 - don't allow recovering and ghosting enforcers
-Revision c8b3809 - Sat, 22 Oct 2011 11:21:21 -0400 - Added akill ids
-Revision ad2ef75 - Sat, 22 Oct 2011 11:20:50 -0400 - Fixed a race condition with installing signal handlers and forking
-Revision 6ce9010 - Fri, 21 Oct 2011 18:01:51 -0400 - Fixed extracting multiple words from our serializable stringstream
-Revision d0afc8c - Fri, 21 Oct 2011 00:21:34 -0400 - Added m_rewrite
-Revision 230b3bc - Thu, 20 Oct 2011 13:38:37 -0400 - Only fork if we are at term
-Revision 1cfb630 - Thu, 20 Oct 2011 11:54:56 -0400 - Fixed a crash in clearusers
-Revision d16f962 - Wed, 19 Oct 2011 12:59:16 -0400 - Bug #1342 - fixed tracking chmodes in bahamuts sjoin
-Revision fc16746 - Tue, 18 Oct 2011 12:18:18 -0400 - Prevent chankill from akilling my clients
-Revision eb5b5f9 - Tue, 18 Oct 2011 12:06:51 -0400 - Fixed compile errors on release build
-Revision faea452 - Tue, 18 Oct 2011 01:48:05 -0400 - Reorder some stuff in Init & the ts6 proto mods to fix weirdness from bots being introduced by 3rd party modules
-Revision 2c614d5 - Sat, 15 Oct 2011 02:08:52 -0400 - Fixed up anoperc to work with the newer startup method
-Revision 89b4be6 - Sat, 15 Oct 2011 00:54:32 -0400 - Fixed crash on /os oper del
-Revision 28ca0e1 - Fri, 14 Oct 2011 22:07:13 -0400 - Fork earlier in startup to prevent it messing up threads, if there are any
-Revision 2504af7 - Fri, 14 Oct 2011 12:53:28 -0400 - Fixed os_forbid adds reason if no expiry is given
-Revision ddc3c2f - Fri, 14 Oct 2011 12:20:07 -0400 - Added options:nonicknameownership config option
-Revision 53275c3 - Tue, 11 Oct 2011 02:50:37 -0400 - Don't add new levels to existing channels default, screws with stuff when the config is reloaded
-Revision f3f6727 - Tue, 11 Oct 2011 00:09:26 -0400 - Bug #1337
-Revision 4681e3a - Mon, 10 Oct 2011 17:19:06 -0400 - Allow chanserv/suspend to take an expiry time
-Revision 80f4f31 - Mon, 10 Oct 2011 15:04:23 -0400 - Put serialized_items on the heap to prevent weird crashes on shutdown from the list being destructed before members in it
-Revision 9f3d735 - Mon, 10 Oct 2011 14:16:59 -0400 - Allow nickserv/suspend to take an expiry time
-Revision 0e012f7 - Sun, 9 Oct 2011 21:29:34 -0400 - Check for being at terminal before forking
-Revision 9f85033 - Sun, 9 Oct 2011 02:52:13 -0400 - Give more verbose messages on startup
-Revision af273e3 - Sun, 25 Sep 2011 15:34:56 -0400 - Store flags for objects, also fixes bug #1333
-Revision 1f3e96f - Sun, 25 Sep 2011 14:42:09 -0400 - Made channel privileges case insensitive
-Revision e7ba639 - Sun, 25 Sep 2011 14:38:21 -0400 - Remove opnotice from example configs
-Revision 1f2399d - Sun, 25 Sep 2011 04:19:15 -0400 - Added a new database format and sqlite support. Also moved db-convert to a module.
-Revision 43201ea - Mon, 19 Sep 2011 18:35:40 -0400 - Fixed /os reload doing weird things to service channels, and allow setting modes by clients on burst
-Revision 7dce64e - Mon, 19 Sep 2011 13:14:20 -0400 - Fixed missing _ in cs_appendtopic
-Revision 1184eb5 - Mon, 19 Sep 2011 13:12:52 -0400 - Allow OnPreHelp to stop processing
-Revision 4c2a492 - Mon, 19 Sep 2011 12:36:52 -0400 - Call fantasy events even if the commands for them don't exist
-Revision be77a7e - Mon, 19 Sep 2011 12:29:54 -0400 - Bug #1334 - fixed crash on /os oper info
-Revision 934723f - Mon, 19 Sep 2011 12:14:02 -0400 - LOG_COMMAND must now always give a valid command
-Revision f07295c - Fri, 16 Sep 2011 14:07:33 -0400 - Bug #1332 - Fixed ValidateUser to not require secure off to disable nickserv kill
-Revision 26c1d67 - Sat, 10 Sep 2011 16:27:10 -0400 - Fixed compile errors & warnings from 1.9.6 to 1.9 merge
-Revision 3d5889c - Sat, 10 Sep 2011 16:08:58 -0400 - Updated channel flag names to remove LOGCHAN
-Revision 213c1c4 - Sat, 10 Sep 2011 02:42:18 -0400 - Changed msgmerge to not use -E.. it will escape all of some languages and mess up poedit etc. Keep it in xgettext for the bold/underline characters.
-Revision 63cb8ca - Sat, 10 Sep 2011 02:06:31 -0400 - Moved signal/thread/mode checking to use signal pipes
-Revision dc5d1fa - Sat, 10 Sep 2011 02:06:31 -0400 - Made ChanServ privileges configurable
-Revision 563d158 - Sat, 10 Sep 2011 02:06:31 -0400 - Allow Config to install cmake
-Revision 1478b5b - Sat, 10 Sep 2011 02:06:29 -0400 - Added chanserv/log
-Revision 19e0b87 - Sat, 10 Sep 2011 02:05:56 -0400 - Removed /bs set msg
-Revision 17ea4ed - Sat, 10 Sep 2011 02:05:03 -0400 - Fixed service_reference to work correctly with external classes
-Revision feaef7c - Sat, 10 Sep 2011 02:05:03 -0400 - Allow services to register or unregister themselves
-Revision c6d3fbd - Sat, 10 Sep 2011 02:05:02 -0400 - Added kqueue
-Revision 700a585 - Sat, 10 Sep 2011 02:05:00 -0400 - Allow modules to add their own channel levels
-Revision 62752db - Sat, 10 Sep 2011 01:58:39 -0400 - Rewrote mlock saving/loading code to not use this silly extensible hack
-Revision f025d1b - Sat, 10 Sep 2011 01:58:38 -0400 - Made service_reference type safe
-Revision 8c4417c - Sat, 10 Sep 2011 01:58:38 -0400 - Removed opnotice
-Revision d4db2b8 - Sat, 10 Sep 2011 01:58:38 -0400 - Made the IsValidHost checks configurable
-Revision bb8e04c - Sat, 10 Sep 2011 01:58:35 -0400 - Added oper:host and oper:vhost
-Revision b504791 - Sat, 10 Sep 2011 01:55:37 -0400 - Cleaned up the dns engine, and fixed sometimes parsing multiple answer queries incorrectly
-Revision d5749c1 - Sat, 10 Sep 2011 01:55:37 -0400 - Fixed eventfd pipeengine to not add the same socket twice
-Revision f54ab5e - Sat, 10 Sep 2011 01:55:29 -0400 - Squash merge of 1.9 to 1.9.6
-Revision 1e45019 - Sat, 10 Sep 2011 01:55:11 -0400 - Added m_proxyscan
-Revision 2eb708e - Sat, 10 Sep 2011 01:55:09 -0400 - Cleaned up some of the socket code, cleaned up the pipe engines, added support for binary sockets, and cleaned up the asynch connect/accept code
-Revision 4fcb371 - Sat, 10 Sep 2011 01:52:59 -0400 - Track what "level" channel status modes are, which allows us to have chanserv/mode determine if a status mode can be set by users better
-Revision 6401d93 - Sat, 10 Sep 2011 01:52:59 -0400 - Added chanserv/up and chanserv/down
-Revision 8a9a39c - Sat, 10 Sep 2011 01:52:59 -0400 - Renamed the core pseudoclient modules to match their names
-Revision 13e8b26 - Sat, 10 Sep 2011 01:52:59 -0400 - Made email messages sent by services configurable
-Revision 8a6d657 - Sat, 10 Sep 2011 01:52:46 -0400 - Removed log:inhabitlogchannel and replaced it with service:channels
-Revision 4a7ba7e - Sat, 10 Sep 2011 00:58:35 -0400 - Removed SZLine. Instead, have AKILL determine whether or not a ZLINE should be set.
-Revision 2b5d9f3 - Sat, 10 Sep 2011 00:54:29 -0400 - Bump for 1.9.6 git
-Revision 3a502f2 - Fri, 9 Sep 2011 23:28:58 -0400 - Anope 1.9.5 Release
-Revision b6dad37 - Fri, 9 Sep 2011 23:28:37 -0400 - Update version.log
-Revision 3cbad7f - Fri, 9 Sep 2011 23:27:15 -0400 - Regenerate language files
-Revision b80a0a8 - Fri, 9 Sep 2011 22:27:51 -0400 - Updated Greek language file
-Revision f844b0a - Fri, 9 Sep 2011 19:18:43 -0400 - Changed User::IsRecognized check to default to secure
-Revision 6bd31b0 - Thu, 8 Sep 2011 19:00:30 -0400 - Bug #1330 & many other small fixes
-Revision 7de1a7a - Mon, 5 Sep 2011 18:40:34 -0400 - Don't try and part service bots twice when channels drop
-Revision 3815e7d - Sat, 3 Sep 2011 14:39:12 -0400 - Translate whole messages before splitting them up to send to users
-Revision 30e6fc0 - Sat, 3 Sep 2011 14:13:14 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision fe1c5d4 - Sat, 3 Sep 2011 14:10:48 -0400 - Bug #1328 - Fixed fantasy to re-split message parameters correctly
-Revision fa5ba63 - Sat, 3 Sep 2011 13:44:20 +0100 - Fixed a typo in the OperServ Global command
-Revision 073db54 - Sat, 3 Sep 2011 01:29:57 -0400 - Added permission check in cs_sync
-Revision ef10b5a - Sat, 3 Sep 2011 06:58:49 +0200 - Fixed operserv global
-Revision 1c5ff92 - Mon, 29 Aug 2011 17:08:26 -0400 - Changed a few fatal exceptions to shutdown a bit more gracefully
-Revision b24ea29 - Mon, 29 Aug 2011 16:13:37 -0400 - Fixed the /ms del message sent to users when they use /ms read
-Revision 5cf3ddb - Mon, 29 Aug 2011 16:03:33 -0400 - Made config rehashing not wipe opers configured with opersev/oper
-Revision 1e1a41f - Sat, 27 Aug 2011 20:58:09 -0400 - Added missing ` in docs/LANGUAGE
-Revision 28e8190 - Sat, 27 Aug 2011 20:47:30 -0400 - Fixed some cmake warnings
-Revision 670c928 - Sat, 27 Aug 2011 17:13:28 -0400 - Tweaked the access operators to allow superadmins to be > channel founders
-Revision d07a692 - Sat, 27 Aug 2011 16:52:07 -0400 - Fixed /cs clone to set botmodes on the botserv bot when cloning channels
-Revision bb52530 - Sat, 27 Aug 2011 16:45:14 -0400 - Fixed mlock with param modes if you change (but not unset) the mode
-Revision 309dfa3 - Sat, 27 Aug 2011 16:14:04 -0400 - Fixed a few mysql problems, including bug #1326
-Revision 5c57f5a - Sat, 27 Aug 2011 15:34:09 -0400 - Fixed /ns logout on other users
-Revision a36e575 - Thu, 25 Aug 2011 19:01:40 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision 8702031 - Thu, 25 Aug 2011 19:01:01 -0400 - Set the creator of default mlocks to the channel founder when a channel is registered
-Revision 1571508 - Thu, 25 Aug 2011 10:16:56 +0200 - Only match users against the more "serious" extbans (ones which prevent users from joining)
-Revision 6dacec2 - Wed, 24 Aug 2011 21:11:23 +0200 - guested nicks are now logged out from the recovered account on /nickserv recover
-Revision fdbbea2 - Wed, 24 Aug 2011 14:27:01 -0400 - Fixed cs_set_misc
-Revision dffed5a - Wed, 24 Aug 2011 13:57:56 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision 5d681a7 - Wed, 24 Aug 2011 13:56:48 -0400 - Clear NS_HELD from nicks when recover expiry is up
-Revision d80e00f - Wed, 24 Aug 2011 13:57:40 +0200 - Fixed automatic fingerprint identify on nickchange between registered nicks
-Revision 21a8bff - Tue, 23 Aug 2011 19:04:27 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision fb14f77 - Tue, 23 Aug 2011 19:03:04 -0400 - Set os_session as having first priority for events
-Revision 2284c31 - Tue, 23 Aug 2011 11:42:40 +0200 - Replaced some chanserv/forbid with operserv/forbid in example.conf and added a check for ForceForbidReason in os_forbid
-Revision b5b2c42 - Mon, 22 Aug 2011 17:14:18 -0400 - Removed this ondeleteobject event, was for m_async_commands which died
-Revision a2f92b6 - Mon, 22 Aug 2011 13:14:08 -0400 - Fixed the db_mysql metadata load events to use the right keys
-Revision c996356 - Sun, 21 Aug 2011 16:35:22 -0400 - Bugs #1321 & 1322
-Revision d71ae41 - Sun, 21 Aug 2011 14:54:06 -0400 - Fixed /cs access add log message to not show override for channel founders
-Revision 68a125b - Sun, 21 Aug 2011 14:33:11 -0400 - Fixed ns_set_misc and cs_set_misc to allow unsetting values
-Revision 37c7ca8 - Sun, 21 Aug 2011 14:09:55 -0400 - Fixed AddAkiller
-Revision 4663970 - Sat, 20 Aug 2011 00:57:35 -0400 - Removed m_async_commands, it can still cause crashes from invalid pointers on the stack & is a giant mess anyway
-Revision a68d17c - Sat, 20 Aug 2011 00:51:39 -0400 - Moved the ERROR log message out of debug
-Revision fa3b74a - Sat, 20 Aug 2011 00:50:26 -0400 - Fixed zlines to only add the xline host, fixed db_mysql's write function, and prevent adding multiple of the same nick to access lists
-Revision fd999b9 - Fri, 19 Aug 2011 16:14:26 -0400 - Fixed some problems with deleting access
-Revision b4f5724 - Fri, 19 Aug 2011 04:20:11 -0400 - Fixed AccessGroup::operator> fail
-Revision abdc69a - Fri, 19 Aug 2011 09:07:19 +0200 - added some log message for automatic fingerprint identify and removed a unused function from ns_cert
-Revision 1b02216 - Thu, 18 Aug 2011 23:08:27 -0400 - Fixed crash in /cs mode
-Revision db340f9 - Thu, 18 Aug 2011 22:04:59 -0400 - Fixed some permission checking fail in modules that got messed up from the big commands sed
-Revision 0cdca53 - Thu, 18 Aug 2011 17:30:49 -0400 - Moved CA_TOPIC to qop aswell. Newer channels (default) to TOPIC at 5 but older channels will remain at founder only, causing access list to think newer aop are level 10000 due to having this permission on older channels.
-Revision 71b9bbd - Thu, 18 Aug 2011 16:48:51 -0400 - Bug #1315 - moved CA_ASSIGN permission from sop to qop
-Revision 2f3969b - Thu, 18 Aug 2011 07:59:58 +0200 - Bug #1317 - fixed sha1 fingerprint hashes in the inspircd protocol modules
-Revision ff7479f - Thu, 18 Aug 2011 00:47:34 -0400 - Fixed attaching to events in db_mysql & possibly having ChannelInfo::WhoSends return NULL if there really are *no* bots
-Revision 487d828 - Wed, 17 Aug 2011 22:05:47 -0400 - Actually made the nickserv block optional
-Revision f41081b - Wed, 17 Aug 2011 21:41:30 -0400 - Include when an access entry was created in access view
-Revision ede910d - Wed, 17 Aug 2011 15:56:40 -0400 - Made /os oper info also show all inherited commands/privs
-Revision 0f4c9a4 - Tue, 16 Aug 2011 16:38:42 -0400 - List supported languages in /ns help saset language
-Revision 9aa414b - Tue, 16 Aug 2011 15:28:21 -0400 - Fixed matching acount access entries against nicknames
-Revision 2d9ddb0 - Tue, 16 Aug 2011 13:43:01 -0400 - Bug #1316 - added permissions for hs_request commands
-Revision 1f542e1 - Tue, 16 Aug 2011 00:16:00 -0400 - Moved cs_seens data purger log message to debug
-Revision 68e0d99 - Tue, 16 Aug 2011 00:09:09 -0400 - Fixed select()ing 0 sockets on Windows
-Revision f43287f - Sun, 14 Aug 2011 22:10:17 -0400 - Fixed grammar problem in cs_clone
-Revision 2e7bd64 - Sun, 14 Aug 2011 21:46:14 -0400 - Fixed /cs clone access
-Revision 786397f - Sun, 14 Aug 2011 21:33:07 -0400 - Massive cleanup of cs_seen, added help, syntax messages, command descriptions, removed lots of dead code, fixed memory leaks, etc
-Revision 960c339 - Sun, 14 Aug 2011 18:50:22 -0400 - Brought back the old 1.7 behavior of a level -1 matching all users and 0 matching all identified users
-Revision fddb230 - Sun, 14 Aug 2011 17:01:28 -0400 - Bug #1312, fixed loading autoowner from db_plain
-Revision 1b8dc4d - Sun, 14 Aug 2011 16:34:20 -0400 - Fixed updating exceptions
-Revision fcc03f4 - Sun, 14 Aug 2011 15:59:14 -0400 - Do not put users hosts in session akills
-Revision 78b8b30 - Sun, 14 Aug 2011 15:27:20 -0400 - Fixed resolving hosts when connecting to our uplink
-Revision 91d8cc4 - Sun, 14 Aug 2011 15:25:02 -0400 - Revert "Fixed resolving hosts on connect"
-Revision 11619be - Sun, 14 Aug 2011 21:21:50 +0200 - Fixed resolving hosts on connect
-Revision e767ded - Sun, 14 Aug 2011 01:01:38 -0400 - Fixed default settings for log blocks
-Revision 83a579f - Sat, 13 Aug 2011 23:05:30 -0400 - Fixed number list position when requesting custom lists from akill
-Revision 244f879 - Sat, 13 Aug 2011 20:00:45 +0200 - Fixed permission check in botserv set
-Revision 6f0da68 - Sat, 13 Aug 2011 09:43:38 -0400 - Fixed anope_os_core insert statement
-Revision af43852 - Sat, 13 Aug 2011 09:27:42 -0400 - Fixed /cs saset noexpire syntax
-Revision ad4c4e4 - Fri, 12 Aug 2011 13:08:53 -0400 - Send replies back to uses after m_ldap_authentication processes
-Revision ed33a4f - Fri, 12 Aug 2011 12:48:29 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision f3d7d4e - Fri, 12 Aug 2011 12:46:11 -0400 - Track when our clients are introduced or not
-Revision bd4916e - Fri, 12 Aug 2011 14:54:31 +0200 - Fixed loading/saving XLines in db_plain
-Revision feee50e - Fri, 12 Aug 2011 03:13:56 -0400 - Allow bot usermodes to be configurable
-Revision 54710a7 - Fri, 12 Aug 2011 01:51:14 -0400 - Removed the unused ChannelModeBan code
-Revision d44a1d0 - Thu, 11 Aug 2011 23:10:08 -0400 - Fixed Windows runtime problems
-Revision c2780e1 - Thu, 11 Aug 2011 22:21:40 +0200 - Added a separate field for last seen realhost to ns_info, shown to services admins only
-Revision 4e1f54f - Thu, 11 Aug 2011 07:03:20 +0200 - added cs_seen
-Revision 3755bf5 - Wed, 10 Aug 2011 15:50:45 -0400 - Ignore SIGPIPE
-Revision 25d422d - Wed, 10 Aug 2011 15:47:02 -0400 - Fixed flags +* and -*
-Revision 697bc8d - Wed, 10 Aug 2011 05:05:09 -0400 - Added a services.host define to easily change every clients hostname
-Revision 4bdc982 - Wed, 10 Aug 2011 01:34:14 -0400 - Added two missing files
-Revision ded98ed - Wed, 10 Aug 2011 01:32:07 -0400 - Fixed windows build
-Revision 13bcc4e - Wed, 10 Aug 2011 00:28:31 -0400 - Replace the old sigaction for a signal when our Signal destructs
-Revision ce92c9b - Tue, 9 Aug 2011 22:18:31 -0400 - Remove +P from unregistered channels if persist is set
-Revision b332fbd - Tue, 9 Aug 2011 18:34:17 -0400 - Fixed parsing TMODE on ratbox
-Revision eaf4e69 - Tue, 9 Aug 2011 17:07:20 -0400 - Updated Changes
-Revision 2f67c70 - Tue, 9 Aug 2011 16:38:10 +0200 - fixed the operserv forbid del command
-Revision 8348392 - Tue, 9 Aug 2011 13:36:33 +0200 - fixed wrong syntax-message for botserv set msg
-Revision 8116ad9 - Tue, 9 Aug 2011 04:38:35 -0400 - Added forgotten founder checks to cs_access, fixed fantasy replies to come from the right service, and fixed the accessgroup operators to acount for founder/superadmin
-Revision cb74359 - Tue, 9 Aug 2011 01:56:08 -0400 - Fixed a typo in init.cpp
-Revision 776583a - Tue, 9 Aug 2011 01:55:34 -0400 - Simiplied a bit of the access system
-Revision 91c3363 - Tue, 9 Aug 2011 00:06:44 -0400 - Hopefully sort this AccessGroup::HasPriv once and for all
-Revision b7542fd - Mon, 8 Aug 2011 23:41:03 -0400 - Added a few sanity checks which never really should happen to db-convert
-Revision 0c860a7 - Mon, 8 Aug 2011 23:32:52 -0400 - Fixed CMakeLists.txt detecting epoll
-Revision 2d591f7 - Mon, 8 Aug 2011 20:34:27 -0400 - When we split from the uplink send a quit for *all* of our clients not just bots
-Revision 9cb96f3 - Mon, 8 Aug 2011 06:24:29 +0100 - Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
-Revision 286a9ed - Mon, 8 Aug 2011 06:19:35 +0100 - Standardized some of the SyntaxError/Help replies and corrected some syntax in BotServ set
-Revision c4da496 - Mon, 8 Aug 2011 00:32:09 -0400 - Copy modules to the runtime directory in one big read/write if we can instead of this 1 byte at a time thing, significantly improves startup loading time.
-Revision ade9239 - Sun, 7 Aug 2011 22:34:16 -0400 - Fixed the pipengines
-Revision c6741d3 - Sun, 7 Aug 2011 19:04:27 -0400 - Always reset the levels of newly created channels, fixed DetermineLevel matching ACCESS_INVALID levels, and added in a disabled config option for levels
-Revision 25e3408 - Sun, 7 Aug 2011 17:43:23 -0400 - Fixed generating sid on startup
-Revision 35588cc - Sun, 7 Aug 2011 16:04:40 -0400 - Made botserv bots with no commands just ignore messages to them, and made bots only tell users to use HELP if they have a HELP command
-Revision 32bb63f - Sun, 7 Aug 2011 15:56:35 -0400 - Updated tables.sql
-Revision 27912e1 - Sat, 6 Aug 2011 19:43:06 -0400 - Fixed two of the xop log messages
-Revision b678aa6 - Sat, 6 Aug 2011 19:41:37 -0400 - Give channel founders +qo by default
-Revision c3e9fc4 - Sat, 6 Aug 2011 18:33:44 -0400 - Show channel founders their channels in /ns alist
-Revision 66ab59d - Sat, 6 Aug 2011 18:21:59 -0400 - Fixed loading older access entries
-Revision deb79e8 - Sat, 6 Aug 2011 18:05:16 -0400 - sed'd a few typos
-Revision a6dd65f - Sat, 6 Aug 2011 17:33:59 -0400 - Fixed suepradmin
-Revision 0448e38 - Sat, 6 Aug 2011 16:49:55 -0400 - Document what /os oline does
-Revision 749de00 - Sat, 6 Aug 2011 04:32:50 -0400 - Update last used times on channels when someone with access uses them
-Revision 7849667 - Sat, 6 Aug 2011 04:16:10 -0400 - Added a define{} block which can be used to easially rename things
-Revision e03efde - Sat, 6 Aug 2011 00:31:24 +0100 - Fixed ns_ajoin to check if adding a duplicate channel
-Revision d6a8d27 - Fri, 5 Aug 2011 16:07:41 +0100 - Fixed an error and typo in CS SET OPNOTICE
-Revision 5e18a72 - Fri, 5 Aug 2011 06:18:38 -0400 - Mark the new commands/ modules as CORE and fixed a typo in the example.conf
-Revision e66063e - Fri, 5 Aug 2011 05:35:31 -0400 - Rewrote the example configurations and split them up into seperate files for each pseudo client.
-Revision 9ec18a3 - Thu, 4 Aug 2011 21:59:01 -0400 - Added a command:permission setting
-Revision 773a1f3 - Thu, 4 Aug 2011 16:41:36 -0400 - Updated a bit of the TODO
-Revision b3f4ba0 - Wed, 3 Aug 2011 06:09:27 -0400 - Start the ts6 sid generator off at 00A if none is given
-Revision 34da226 - Wed, 3 Aug 2011 05:54:03 -0400 - Generate random SIDs for us if one is not specified
-Revision 16280f4 - Wed, 3 Aug 2011 05:42:41 -0400 - Added operserv/kill and removed version.h from .gitignore
-Revision 42f954f - Tue, 2 Aug 2011 22:39:14 -0400 - Fixed reintroducing our clients if we disconnect and reconnect to the uplink
-Revision 09f5591 - Tue, 2 Aug 2011 05:07:59 -0400 - Fixed /cs clone copying channel access, fixed restricted, and fixed some compiler warnings
-Revision f690cd8 - Tue, 2 Aug 2011 02:02:13 -0400 - Made /ns info default to your account or your nick if no arguments are given
-Revision d43e1fb - Tue, 2 Aug 2011 01:50:09 -0400 - Added opertype:modes
-Revision 41b40f6 - Mon, 1 Aug 2011 23:42:20 -0400 - Split /os mode into /os mode and /os umode to make giving permission to just one possible
-Revision f7adc0b - Mon, 1 Aug 2011 22:37:27 -0400 - Rewrote the access systems and added a flags access system
-Revision 710c02f - Sun, 31 Jul 2011 19:11:26 +0100 - Fixed bug #1301 - Changed operserv/staff to reflect its renaming to operserv/oper
-Revision 7f69d2b - Sun, 31 Jul 2011 14:41:59 +0100 - Fixed bug #1300
-Revision a18e3f3 - Sun, 31 Jul 2011 07:00:27 -0400 - Bugs 1297-1299 and made /os stats work like the help describes it does
-Revision 63a4201 - Sun, 31 Jul 2011 06:24:24 -0400 - Fixed these ModuleManager::Attach calls once and for all..
-Revision b751800 - Sun, 31 Jul 2011 06:24:11 -0400 - Fixed os_defcon
-Revision f321491 - Sun, 31 Jul 2011 04:00:35 -0400 - Fixed error message from being unable to connect
-Revision 1cb11bb - Sun, 31 Jul 2011 03:22:23 -0400 - Fixed a few small problems, including m_ssl's connect feature sometimes failing for no good reason
-Revision f29c88b - Fri, 29 Jul 2011 22:50:45 +0100 - Fixed bug #1294, Crash on NS SET HIDE
-Revision f5e78d7 - Thu, 28 Jul 2011 07:06:08 +0100 - Fixed a typo in the nickserv/auspex oper privilege
-Revision 25c4985 - Thu, 28 Jul 2011 06:36:29 +0100 - Fixed OS LOGONNEWS
-Revision cd4f6da - Wed, 27 Jul 2011 19:24:58 -0400 - Bug #1289 - Fixed hooking to delcore event in cs_main
-Revision 6e032de - Wed, 27 Jul 2011 19:17:21 -0400 - Bug #1288 - Fixed crash on /cs help access
-Revision e2b47e0 - Wed, 27 Jul 2011 19:06:42 -0400 - Bug #1291 - fixed parsing JOIN on ratbox
-Revision b32c961 - Wed, 27 Jul 2011 16:54:50 +0100 - Show the description in cs help set instead of the syntax
-Revision 088337e - Tue, 26 Jul 2011 23:18:54 -0400 - Fixed /os ignore, /os exception del, and a crash in /cs entrymsg
-Revision e8c00b9 - Tue, 26 Jul 2011 05:44:14 -0400 - A few small fixes
-Revision 023d4b4 - Sat, 23 Jul 2011 13:22:56 +0100 - Fixed a typo that broke CS SET RESTRICTD and re-added abbreviation for CS SET DESC
-Revision 87d2f4b - Sat, 23 Jul 2011 13:07:19 +0100 - Fix couple of typos in modules
-Revision 39ca53c - Sun, 17 Jul 2011 21:58:27 +0100 - Fixed hs_request and corrected a typo(?) in hs activate
-Revision 46f2f3b - Sun, 17 Jul 2011 13:08:15 +0100 - Fixed some of the extra modules
-Revision cb56d50 - Sun, 17 Jul 2011 06:08:35 -0400 - Fixed up cs_set_misc and ns_set_misc
-Revision b19dddb - Sat, 16 Jul 2011 07:03:04 -0400 - Fixed a few of the /cs set syntax messages to reflect the new syntax
-Revision acceabe - Sat, 16 Jul 2011 06:52:13 -0400 - Bug #1287 - Only check if users should be deopped on syncing channels when the user is on a server that is also syncing.
-Revision c3993b3 - Thu, 14 Jul 2011 22:37:46 -0400 - Fixed appending !*@* to some access list entries that are valid hosts
-Revision f277be0 - Thu, 14 Jul 2011 21:40:21 -0400 - Fixed OSOpersOnly & CSOpersOnly
-Revision 1a2486d - Thu, 14 Jul 2011 20:52:24 -0400 - These .pot files don't need to be under version control
-Revision a735095 - Thu, 14 Jul 2011 20:00:39 -0400 - Added cs_sync
-Revision ef75e17 - Thu, 14 Jul 2011 19:11:13 -0400 - Added bs_autoassign
-Revision 5bf7dee - Thu, 14 Jul 2011 18:29:03 -0400 - Made channel descriptions optional
-Revision f858164 - Thu, 14 Jul 2011 02:31:12 -0400 - Rewrote how commands are handled within Anope. This allows naming commands and having spaces within command names.
-Revision 924f684 - Sun, 10 Jul 2011 19:32:10 -0400 - Bug #1283 - Upped the buffer used for messge replies, as some can be really big
-Revision b5ec57a - Sun, 10 Jul 2011 19:07:45 -0400 - Bug #1285 - Fixed setting -P on channels with only a service bot in it
-Revision 6d97848 - Sun, 10 Jul 2011 18:27:48 -0400 - Bug #1286 - Dont allow actions to mess up the caps kicker
-Revision d2832b1 - Thu, 7 Jul 2011 02:23:11 -0400 - Use getrlimit instead of ulimit, fixes freebsd build
-Revision 1a4fc39 - Wed, 6 Jul 2011 22:06:07 -0400 - Do not send news when a server is syncing
-Revision 97388ab - Wed, 6 Jul 2011 22:05:01 -0400 - Fixed /hs set and /hs setall not allowing only a host
-Revision 57ec310 - Wed, 6 Jul 2011 05:20:25 -0400 - Only call send once per write event in dns manager
-Revision ffd5c04 - Wed, 6 Jul 2011 00:33:25 -0400 - Fixed chanserv/access/modify permission on non-xop channels
-Revision cc3c2b6 - Tue, 5 Jul 2011 01:39:11 -0400 - Send account data once an account is confirmed
-Revision c549aa4 - Mon, 4 Jul 2011 22:39:13 -0400 - Bug #1279 - Fixed strftime
-Revision 714831b - Mon, 4 Jul 2011 22:34:21 -0400 - Bug #1282
-Revision d6879c4 - Mon, 4 Jul 2011 14:25:13 -0400 - Bug #1280 - Fixed reading some na and bi flags in db_plain
-Revision 2caf586 - Sun, 3 Jul 2011 00:19:54 -0400 - Clean up some of the dns code, udp is connectionless anyway so this isnt required
-Revision c585964 - Mon, 27 Jun 2011 19:14:30 -0400 - Fixed the mode manager from complaining about prefixless modes on insp20
-Revision 936a50d - Mon, 27 Jun 2011 15:35:09 -0400 - Fixed build on older cmake versions
-Revision 3e98880 - Fri, 24 Jun 2011 03:40:18 -0400 - Fixed mail delay time
-Revision 821826a - Fri, 24 Jun 2011 02:58:40 -0400 - The other part of #1277
-Revision 7ec803f - Thu, 23 Jun 2011 15:31:57 -0400 - Bug #1277 - Dont send account data for unconfirmed nicks
-Revision b1a075b - Thu, 23 Jun 2011 15:10:50 -0400 - Fixed bug #1276 and some other valgrind warnings
-Revision 3be75cb - Mon, 20 Jun 2011 23:28:25 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision 2667f90 - Mon, 20 Jun 2011 23:25:46 -0400 - Cleaned up some of the logger code which fixes not logging debug logs to files etc when debug is enabled, and some other small things
-Revision 2601871 - Mon, 20 Jun 2011 23:09:03 -0400 - Fix long-standing issue with the get token functions if the delimiter wasn't found in the string but you wanted the first "token".
-Revision a3d0ab3 - Mon, 20 Jun 2011 23:00:49 -0400 - Use case insensitive matching when looking up servers by name
-Revision a1b36ec - Fri, 17 Jun 2011 19:57:43 -0400 - Search all domains for language strings, fixes the mess that we used to use to translate strings in 3rd party modules
-Revision 48e995d - Fri, 17 Jun 2011 13:34:47 -0400 - Bug #1275 - Don't log absolutely everything sent to operserv, most of its commands already have their own logs
-Revision df971be - Tue, 14 Jun 2011 18:23:53 -0400 - Fixed a few small things
-Revision 1cd6587 - Mon, 13 Jun 2011 18:20:22 +0200 - changed some _() to gtl() and updated do_strftime() and duration()
-Revision 6148ffa - Sun, 12 Jun 2011 06:28:22 +0200 - added a Anope::string::capacity() function
-Revision 717b4c3 - Thu, 9 Jun 2011 06:16:31 +0200 - small improvement for Timer::SetSecs()
-Revision 74361be - Tue, 7 Jun 2011 06:16:57 +0200 - added a Timer::SetSecs() function
-Revision a087e7f - Sun, 5 Jun 2011 18:18:50 -0400 - Fixed clearing bandata
-Revision 3ad93a3 - Thu, 2 Jun 2011 14:59:34 -0400 - Burst our channels with the uplink when we connect & fixed bug #1274
-Revision 184b346 - Thu, 2 Jun 2011 12:45:08 -0400 - Place version.h in build/ not include/
-Revision b2c807d - Mon, 30 May 2011 13:14:33 -0400 - Fixed /ns alist
-Revision 60548aa - Sun, 29 May 2011 19:05:28 -0400 - Fixed ns_update and db_mysql_live sql queries
-Revision a45d155 - Mon, 23 May 2011 14:47:14 -0400 - Added an IsServicesOper event
-Revision 121ae0b - Mon, 23 May 2011 13:32:01 -0400 - Added m_statusupdate
-Revision 8bf8832 - Mon, 23 May 2011 04:41:51 -0400 - Rewrote the signal handling to use sigaction
-Revision 4dd7e26 - Sun, 22 May 2011 09:05:21 +0200 - fixed a possible crash on database saving
-Revision f4329df - Sat, 21 May 2011 15:33:10 -0400 - Merge branch '1.9' of anope.git.sf.net:/gitroot/anope/anope into 1.9
-Revision 98729a6 - Sat, 21 May 2011 15:32:47 -0400 - Bug #1271
-Revision 742ba97 - Sat, 21 May 2011 15:15:46 +0200 - fixed bug #1272
-Revision 115f94b - Sat, 21 May 2011 04:57:27 -0400 - Made Anope able to process normally when disconnected from the uplink and not sleep(), enable usage of non-blocking connect() and default all sockets to non blocking mode. Some cleanup to m_ssl and some cleanup to main.cpp.
-Revision 7e57272 - Thu, 19 May 2011 20:36:39 -0400 - Fixed compile from the earlier merge
-Revision 13915d8 - Mon, 16 May 2011 04:10:18 -0400 - Modularized os_news
-Revision 9962fae - Mon, 16 May 2011 04:10:18 -0400 - Calculate nc::channelcount at runtime
-Revision 9fcbe29 - Mon, 16 May 2011 04:10:18 -0400 - Added os_oper
-Revision fd4b52e - Mon, 16 May 2011 04:10:18 -0400 - Added os_forbid
-Revision b59602a - Mon, 16 May 2011 04:10:18 -0400 - Check for a valid server in /operserv noop
-Revision fd21c36 - Mon, 16 May 2011 04:10:18 -0400 - Fixed some logic fail in ts6_uid_retrieve
-Revision b999c6c - Mon, 16 May 2011 04:10:15 -0400 - Expand more on m_alias and changed some std::string usage in sockets.cpp to use Anope::string
-Revision 583954d - Mon, 16 May 2011 04:09:32 -0400 - Use module type to determine what type each module is instead of its location in the configuration file.
-Revision 8fb1604 - Mon, 16 May 2011 04:09:07 -0400 - Fixed reading empty config values in the multiconfig code, caused by removal of DT_CHARPTR
-Revision 284af25 - Mon, 16 May 2011 04:09:07 -0400 - Added more useful functions to our LDAP API, allow adding newly registered accounts to LDAP, removed some unnecessary OnPre events and fixed unloading all modules
-Revision e7887c1 - Mon, 16 May 2011 04:08:47 -0400 - Unmodularized the socket engine because its causing problems and really is unnecessary
-Revision 076ebaf - Mon, 16 May 2011 04:07:56 -0400 - Moved some global functions to be member functions and misc cleanup
-Revision 6922bd2 - Mon, 16 May 2011 04:07:30 -0400 - Fixed up the MySQL Query code and finished some command code I forgot earlier
-Revision 13aa58c - Mon, 16 May 2011 04:06:22 -0400 - Removed DT_CHARPTR from the config reader, its unneeded
-Revision c8c2315 - Mon, 16 May 2011 04:06:17 -0400 - Moved the core pseudo clients out into their own modules
-Revision 1782ce2 - Mon, 16 May 2011 04:01:50 -0400 - Use std::map instead of unordered_map
-Revision b28d374 - Mon, 16 May 2011 04:01:46 -0400 - Branch for 1.9.5
+Revision 3f3657a - Sat, 27 Aug 2011 21:11:01 -0400 - Fixed windows build
+Revision 49b81a5 - Sat, 27 Aug 2011 21:05:48 -0400 - Update changes.conf, bump version to 1.9.4-p1-git
+Revision 99e4eae - Sat, 27 Aug 2011 15:35:09 -0400 - Fixed /ns logout on other users
+Revision 232af7f - Sun, 21 Aug 2011 14:56:53 -0400 - Moved the ERROR log message out of debug (cherry picked from commit a68d17c17e904881b580d29290ae37bb2627b51b)
+Revision 9c8a789 - Thu, 18 Aug 2011 00:46:17 -0400 - Fixed ns alist min level
+Revision 389341b - Sat, 13 Aug 2011 21:59:12 -0400 - Fixed number list position when requesting custom lists from akill and sqline
+Revision 949f869 - Wed, 10 Aug 2011 17:36:24 -0400 - Use case insensitive matching for server names
+Revision 8d551f2 - Tue, 9 Aug 2011 18:37:33 -0400 - Fixed crash in /ns set
+Revision 962002b - Tue, 9 Aug 2011 18:36:23 -0400 - Fixed JOIN on plexus & fixed UMODE_NETADMIN
+Revision 1ce0199 - Tue, 9 Aug 2011 17:50:15 -0400 - Fixed build
+Revision 5d6f4cf - Tue, 9 Aug 2011 17:39:25 -0400 - Added a few sanity checks which never really should happen to db-convert (cherry picked from commit b7542fd6f29b5fec45314dbf65f599c5bd2b3650)
+Revision 2b03500 - Tue, 9 Aug 2011 17:38:32 -0400 - Updated TODO
+Revision 4d6b824 - Tue, 9 Aug 2011 17:37:12 -0400 - Made /os stats work like the help describes
+Revision 389dde0 - Tue, 9 Aug 2011 17:29:38 -0400 - Bug #1291 - fixed parsing JOIN on ratbox (cherry picked from commit e2b47e001fe0f4560bbf050964d9e60d20cb4e2b)
+Revision 59fad58 - Tue, 9 Aug 2011 17:29:14 -0400 - Fixed nickserv help output
+Revision d5d2a31 - Tue, 9 Aug 2011 17:27:39 -0400 - Fixed appending diff@* to some access list entries that are valid hosts
+Revision 7f4eb85 - Tue, 9 Aug 2011 17:25:40 -0400 - Bug #1285 - Fixed setting -P on channels with only a service bot in it (cherry picked from commit b5ec57a3f9fdc9e7c7321392082dec0d475c623c)
+Revision e9ce53f - Tue, 9 Aug 2011 17:25:22 -0400 - Use getrlimit instead of ulimit, fixes freebsd build of poll()
+Revision 7c06078 - Tue, 9 Aug 2011 17:24:02 -0400 - Do not send news when a server is syncing
+Revision 205eb1c - Tue, 9 Aug 2011 17:22:50 -0400 - Fixed chanserv/access/modify permission on non-xop channels (cherry picked from commit ffd5c045e4018849c3ff7084955d50c0f852d00b)
+Revision 11fdf16 - Tue, 9 Aug 2011 17:22:31 -0400 - Send account data once an account is confirmed (cherry picked from commit cc3c2b6999fa58a1be791b1ace1f4e7dc83cf9ec)
+Revision 0c47383 - Tue, 9 Aug 2011 17:21:58 -0400 - Fixed mail delay time (cherry picked from commit 3e9888092a7859dbf2c7b1cc6baffa192a007132)
+Revision fa9f6a3 - Tue, 9 Aug 2011 17:21:28 -0400 - Fixed sending account data for unconfirmed accounts
+Revision 6574bca - Tue, 9 Aug 2011 17:14:23 -0400 - Fixed destructing bots with commands and fixed quitting services enforcers
+Revision ae72c25 - Tue, 9 Aug 2011 17:12:56 -0400 - Bugs #1271 and #1272
 Revision 469a04e - Mon, 16 May 2011 02:58:06 -0400 - Anope 1.9.4 Release
 Revision 605b5d5 - Mon, 16 May 2011 02:57:28 -0400 - Removed ngircd as we've decided not to support it at this time
 Revision f7aa46f - Mon, 16 May 2011 02:47:23 -0400 - Note m_async_commands is experimental
@@ -947,7 +584,7 @@ Revision 0d2d7e9 - Sun, 20 Jun 2010 20:05:23 -0400 - Fixed Windows build
 Revision 63d7bee - Sun, 20 Jun 2010 18:51:03 -0400 - Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
 Revision 381c9c8 - Sun, 20 Jun 2010 18:42:58 -0400 - The first of a few "CBX OCDing over code style" commits, focusing on include/* and src/* but not src/core/* or src/modules/*.
 Revision e8a1570 - Sun, 20 Jun 2010 14:04:17 -0400 - Added m_helpchan to replace the cores helpchannel functionality
-Revision 968e4d0b - Sun, 20 Jun 2010 13:11:31 -0400 - Fixed the name of cs_forbid in chanserv:modules so it really loads
+Revision 968e4d0 - Sun, 20 Jun 2010 13:11:31 -0400 - Fixed the name of cs_forbid in chanserv:modules so it really loads
 Revision 7b7e2a6 - Sat, 19 Jun 2010 21:22:48 -0400 - Updated TODO
 Revision 448eadd - Sat, 19 Jun 2010 20:53:53 -0400 - Made db-converter add all of the core clients when converting a 1.8 database
 Revision 68b54f3 - Sat, 19 Jun 2010 13:39:12 -0400 - Made db-converter only write mlock params if there really is one, fixes some problems with converting mlock for certain databases

docs/Changes

@@ -1,39 +1,20 @@
-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-p1
+---------------------
+F Fixed using /ns logout on other users
+F Fixed number list position when requesting /os akill list and /os sqline list
+F Fixed server matching to be case insensitive
+F Fixed a crash in /ns set
+F Fixed parsing TMODE on ratbox
+F Fixed parsing JOIN on ratbox and plexus
+F Fixed nickserv help output
+F Fixed appending !*@* to some access list entries
+F Fixed setting -P on channels with only a service bot in it
+F Fixed freebsd build of poll engine
+F Fixed the chanserv/access/modify permission to work on non-xop channels
+F Fixed the mail delay error message to show the correct time
+F Fixed sending account data for unconfirmed nicks on InspIRCd
+F Fixed deleting bots sometimes causing crashes/other weird behaviors
+F Fixed /ms ignore syntax errors
 
 Anope Version 1.9.4
 --------------------

docs/Changes.conf

@@ -1,17 +1,3 @@
-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 **

docs/DEFCON

@@ -31,11 +31,10 @@ Anope DefCon
 
     The DefCon system is part of Anope's core,
 
-    The DefCon system has to be configured on your operserv.conf file to
-    be enabled. Defcon will be disabled if "defaultlevel" in the defcon
-    block is left commented, or set to 0. Look for the defcon block
-    on your operserv.conf file for more information on enabling and
-    configuring it.
+    The DefCon system has to be configured on your services.conf file to
+    be enabled. The defcon module will not unload unless all non-optional
+    directives are set. Look for the defcon block
+    section on your services.conf file for more information.
 
     Make sure you restart Anope after changing the DefCon configuration
     directives.
@@ -46,7 +45,7 @@ Anope DefCon
 
     No new channel registrations 
     No New Nick Registrations 
-    No Mode Lock changes
+    No MLOCK changes 
     Force Chan Mode 
     Use Reduced Session Limit 
     KILL any new clients trying to connect 
@@ -56,7 +55,7 @@ Anope DefCon
     No new memos sent to block MemoServ attacks
     
     Information regarding how to enable this for specific defcon levels can
-    be found in operserv.conf
+    be found in services.conf
 
 4) Usage
 
@@ -71,18 +70,22 @@ Anope DefCon
 
     /msg OperServ DEFCON 4
 
+    *** Global -- from OperServ: dengel Changed the DEFCON level to 4
+
     -OperServ- Services are now at DEFCON 4
     -OperServ- * No new channel registrations
     -OperServ- * No new nick registrations
-    -OperServ- * No mode lock changes
+    -OperServ- * No MLOCK changes
     -OperServ- * Use the reduced session limit of 5
 
-    -Global- The Defcon Level is now at: 4
+    -Global- The Defcon Level is now at Level: 4
 
     Restore normal readiness:
 
     /msg OperServ DEFCON 5
 
+    *** Global -- from OperServ: dengel Changed the DEFCON level to 5
+
     -OperServ- Services are now at DEFCON 5
 
     -Global- Services are now back to normal, sorry for any inconvenience

docs/INSTALL.fr

@@ -1,209 +0,0 @@
-Installation et instructions d'anope
-------------------------------------
-
-1) Instalation d'anope
-2) Mise à jour d'anope
-3) Configuration de l'ircd
-4) Mise en route de anope
-5) Mise en place d'un fichier crontab
-
-Note: Vous devrez également lire les fichiers README et FAQ !
-
-1) Installation de anope
-
-      Note importante: il n'est pas recommandé d'utiliser (et même d'installer)
-                     Anope en tant que root.
-                     Utilisez un utilisateur non privilégié,
-
-
-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/
-
-
-
-Anope peut être installer de deux façons.
-
- 1.  La méthode recommandée est d'utiliser CMake.
-     Vous pouvez vérifier si CMake est déjà installé sur votre système en utilisant la
-
-     commande:  cmake --version ( sur votre vps ou dedier etre loggué en root )
-
-
-     Si c'est installé, vous aurez une ligne qui dit quelque chose qui ressemble à
-
-     «version 2.6 cmake-patch 1".
-
-     Si la version est inférieure à 2,4 ou si vous obtenez une erreur disant que la commande n'a pas été trouvé,
-     vous ne serez pas en mesure d'utiliser CMake,
-
-     sauf si vous installez vous-même dans votre répertoire home. CMake
-     vous pouvez le téléchargé ici >  http://www.cmake.org/cmake/resources/software.html
-
-
-     Si vous n'arrivez pas à installer (soit en raison du manque d'espace
-     ou de restrictions par votre fournisseur d'hébergement),
-     vous pouvez encore utiliser le script de configuration fournis.
-     Cette option n'est pas recommandée et finira par être retiré, mais il est fourni pour la compatibilité de ces
-     manque de CMake.
-
-
-
-    Ensuite, décompressez le package dans votre répertoire home, et allez dans le répértoire
-    qui viens d'être crée.
-
-    Maintenant, tapez ./Config pour lancer le script de configuration. Il va vous poser
-    quelques questions, et compiler Anope sur votre système.
-
-    Si vous ne savez pas repondre à une question, utilisez la valeur par défaut.
-
-
-    Vous pouvez maintenant taper make pour compiler Anope. S'il ya des erreurs dans la
-    Makefile, * essayez d'utiliser * gmake au lieu. Si cela ne fonctionne toujours pas, vous (ou
-    votre fournisseur ) doit installer GNU make. Vous pouvez
-    le Trouvez sur ftp://prep.ai.mit.edu/pub/gnu/.
-
-    Maintenant, tapez make install (ou gmake install; voir ci-dessus). Cela permet d'installer
-    tous les fichiers nécessaires dans les chemins que vous avez spécifié dans la configuration 
-    script, et les permissions du fichier de configuration. Vous devez vous assurer que les données
-    répertoire ne sont pas accessible par d'autres utilisateurs, que des utilisateurs malveillants peuvent
-    causer des problèmes sur votre réseau, si les mots de passe ne sont pas cryptés, ou de lire
-    les mémos de tout utilisateur.
-
-    Si vous voyez des erreurs lors de ce processus, s'il vous plaît nous envoyer un mail avec le * complet *
-    sortie d'erreur, et n'oubliez pas de mentionner votre OS, compilateur et bibliothèque C + +
-    versions.
-
-    Maintenant, allez dans le répertoire de données (par défaut, cd ~/services/data). ouvrer exemple.conf
-    avec votre éditeur de texte favori. Il contient toute la configuration
-    directives. Anope va l'utiliser au démarrage. Lisez attentivement les instructions contenues dans
-    le fichier. l'utilisation des valeurs par defauld n'est pas recomment et anope ne risque pas de fonctionner
-
-
-    Si vous avez besoin d'aide, vous devez vous abonner à la mailing list et par courrier Anope
-    pour se faire aider par d'autres utilisateurs. Voir le fichier README pour plus de
-    informations.
-
-2) Mise à jour Anope
-
-    Si vous avez un fichier .Diff et que vous voulez patcher les ancienne sources Anope avec,
-    effectuer les opérations suivantes:
-
-        * Copiez le fichier .Diff dans le répertoire racine des sources Anope.
-        * Type de patch-p1 <file.diff
-
-   Notez que la mise à jour anope avec un fichier patch n'est pas recommandé. 
-   Vous devez télécharger une nouvelle source propre, car cela vous donnera les meilleurs résultats..
-
-    Pour mettre à jour Anope, suivez simplement les instructions d'installation décrites dans
-    l'article 1. Il y a cependant quelques règles spécifiques:
-
-        * IMPORTANT: Sauvegardez vos anciennes bases de données!
-        * Si vous mettez à jour vers une nouvelle version majeure, toujours redémarrer avec un 
-          fichier de configuration neuve example.conf.
-
-
-
-3) Mise en place du IRCd
-
-    Ce Services agit comme un serveur IRC avec des pseudo-clients sur elle. Pour les relier à
-    votre réseau, vous aurez besoin d'ajouter quelques lignes dans le ircd.conf de leur plate-forme
-    serveur (comme indiqué dans la directive de configuration RemoteServer).
-
-    Pour les échantillons ci-dessous, nous allons prendre services.localhost.net que le nom de la
-    Services (comme indiqué dans la directive de configuration ServerName). Notez que
-    présente des échantillons sont faites pour être aussi générique que possible, mais il pourrait y avoir
-    de petites variations, en fonction de votre IRCd. Pour IRCd aide spécifique aux
-    de configuration, lire près de la fin de cette section.
-
-    Tout d'abord, les lignes C / N, qui permettent aux services de crée un lien. Ils ont également besoin d'un
-    Y: ligne fonctionne correctement.
-
-        Y: 27:180:0:0:4000000
-        C: 127.0.0.1: mypass: services.localhost.net: 30
-        N: 127.0.0.1: mypass: services.localhost.net: 30
-
-    "mot de pass" est le même mot de passe que vous avez mentionné dans le RemoteServer
-    directive de configuration. 127.0.0.1 est l'adresse IP à partir de laquelle les services se connecterons
-    à partir de (reliant en localhost est le moyen le plus efficace pour exécuter les services).
-
-    Ensuite, vous avez à mettre en place un U:ligne, qui permettra aux services de changer
-    modes de canal, de sujets, et bien plus encore, sans être op sur le canal.
-
-        U: services.localhost.net: *: *
-
-    REMARQUE: si vous avez plus d'un serveur dans votre réseau, cette ligne doit
-          être ajouté sur tous les autres serveurs, où cela ne risque pas de fonctionner correctement.
-
-    Enfin, vous aurez besoin d'ajouter un H:ligne, pour permttre la commande OperServ JUPE
-    de fonctionner correctement.
-
-        H:*::Services.LocalHost.Net
-
-    Ne pas oublier de /rehash votre IRCd pour appliquer les modifications.
-
-   Une nouvelle tendance dans la configuration ircd  hybride, Unreal et Bahamut, qui utilisent une approche plus
-    «Lisibles» sous forme de configuration. Pour ceux, utiliser quelque chose comme:
-
-        link services.localhost.net
-        {
-            username        *;
-            hostname        localhost;
-            bind-ip         *;
-            port            6667;
-            hub             *;
-            password-connect "mypass";
-            password-receive "mypass";
-            class           servers;
-        };
-
-    Notez que ce bloc de fichiers de configuration de style est diffèrent 
-    sur le IRCd. Consultez le fabricant de lien interactif (le lien est ci-dessous) pour plus
-    détails sur la configuration exacte utilisée par votre IRCd.
-
-    Si vous êtes incapable d'obtenir un lien avec votre IRCd après la lecture de cet article,
-    vous pouvez essayer le fabricant lien interactif, qui est situé au:
-
-        http://anope.org/ilm.php
-
-4) A partir Anope
-
-    Allez dans le répertoire où les fichiers binaires ont été installés (par défaut, ce n'est
-    ~/ Services/ bin). Tapez. /Services à lancer Anope.
-
-    S'il ya des erreurs de syntaxe dans le fichier de configuration, ils seront
-    affiche sur l'écran. Corrigez-les jusqu'à ce qu'il n'y à plus d'erreur.
-    Un démarrage réussi ne générera pas de message.
-
-    Donner aux services au moins une minute pour se connecté à votre réseau, comme certains
-    IRCds sur certains OS peut être très lent pour le processus de liaison. Si rien n'arrive après environ une minute,
-    il y a probablement un problème de configuration. Essayez
-    de lancer Anope en mode debug  ./services-debug-nofork pour voir toutes les erreurs qu'il
-    rencontres, et d'essayer de les corriger.
-
-    Si vous avez besoin d'aide pour résoudre des erreurs, n'hésitez pas à vous abonner à la Anope
-    liste de diffusion et de poser là. Voir le fichier README pour plus de détails.
-
-5) Mettre en place un crontab
-
-    Une entrée crontab vous permettra de vérifier périodiquement que Anope est
-    toujours en cours, et redémarrez-le s'il n'est pas.
-
-    D'abord renommer le script example.chk qui est dans le chemin de Anope (par défaut,
-    cela est ~/services/data) pour services.chk et le modifier. 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 essayer de lancer le
-    script pour voir si cela fonctionne (Anope ne doit pas être en marche lorsque vous faites cela ;))
-
-    Lorsque cela est fait, vous devrez ajouter l'entrée crontab. Type de crontab-e. 
-    Cela va ouvrir l'éditeur de texte par défaut avec le fichier crontab. Entrez le chemin
-    suivant (avec le chemin correct):
-
-        * / 5 * * * * /home/ircd/services/data/services.chk> /dev/nul 2> & 1
-
-    Le * / 5 au commencement signifie "vérifier toutes les 5 minutes". Vous pouvez remplacer
-    le 5 avec un autre numéro si vous voulez (mais moins de 60). Consulter
-    pages de manuel de votre système pour plus de détails sur la syntaxe de la crontab
-    fichier. Intéressant pages de manuel sont crontab (5), crontab (1) et cron (8).
-
-    Sauvegarder et quitter, et il est installé.

docs/LANGUAGE

@@ -7,7 +7,7 @@ Anope Mutli Language Support
 
 1) Building Anope with gettext support
 
-    To build Anope with gettext support, gettext and its development libraries must be installed on the system.
+    To build Anope with gettext support gettext and its devlopmental libraries must be installed on the system.
     Anope does not require locales to be installed or enabled on the system, but does require the locales-all
     package on Debian and Debian based systems.
 
@@ -32,15 +32,8 @@ Anope Mutli Language Support
 3) Using langages with modules
 
     Module authors can easially add the ability to have their modules translated by adding _() around the strings they
-    want translated (messages to the user, etc).
-
-    If you want to translate a module someone has made, first generate a .pot file if there isn't one already using
-    `xgettext -s -d modulename -o modulename.pot --from-code=utf-8 modulename.cpp`.
-    The .pot file is a template of all of the language strings extracted from the source file.
-
-    Next, run msginit on the .pot file with
-    `msginit -l language -o modulename.language.po -i modulename.pot`.
-    Translate the new .po file and rerun ./Config; make && make install.
-
-    All .po and .pot files should be placed in modules/language/third. Additionally an update script is provided there
-    that will create .pot files and merge any changes to it with existing .po files.
+    need translated (messages to the user, etc). See a few of the modules in /modules/extras (cs_appendtopic, hs_request)
+    for examples of this. If you want to translate a module someone has made, first generate a .pot file if there is none.
+    Run `xgettext -s -d modulename -o modulename.pot --from-code=utf-8 modulename.cpp`. Then, run msginit on the .pot file
+    with `msginit -l language -o modulename.language.po -i modulename.pot`. Translate the new .po file, then place it in
+    the lang folder and rerun ./Config; make && make install.

docs/README

@@ -1,7 +1,7 @@
 Anope -- a set of IRC services for IRC networks
 -----------------------------------------------
 
-Anope is          2003-2012 Anope Team    <team@anope.org>.
+Anope is          2003-2011 Anope Team    <team@anope.org>.
 Based on Epona    2000-2002 PegSoft       <epona@pegsoft.net>.
 Based on Services 1996-1999 Andrew Church <achurch@achurch.org>.
 
@@ -116,6 +116,37 @@ Table of Contents
         * Christopher N. <saka@epiknet.org> (fr.l)
         * Yusuf Kurekci <ysfm.20@gmail.com> (tr.l)
 
+    Anope uses the strlcat() and strlcpy() functions from OpenSSH 2.5.1p2.
+    These functions are copyrighted by Todd C. Miller:
+
+        Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+        All rights reserved.
+
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted provided that the following conditions
+        are met:
+        1. Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+        2. Redistributions in binary form must reproduce the above copyright
+           notice, this list of conditions and the following disclaimer in the
+           documentation and/or other materials provided with the distribution.
+        3. The name of the author may not be used to endorse or promote
+           products derived from this software without specific prior written
+           permission.
+
+        THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
+        WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+        IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+        INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+        BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+        OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+        ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+        TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+        USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+        SUCH DAMAGE.
+
+
 2) Presentation
 
     Anope is a set of Services for IRC networks that allows users to manage

docs/TODO

@@ -3,23 +3,43 @@ Legend:
 	? = unsure
 	+ = in progress
 
+1.9.4
+-----
+[x] MS IGNORE. Make it take nick (accounts) or n!u@h masks. Fake success of memo send still, but send to opers?
+[x] Allow users to delete their own access
+[x] ChanServ CLONE command
+[x] XMLRPC to execute commands and get data from Anope
+[+] fantasy: allow replies/notifications to fantasy commands to go to the channel via notice
+[x] Method to store listmodes (more generically than AKICK, too) for e.g. +beI and extbans, etc.
+[x] understanding extbans for /cs unban etc.
+[x] (optional?) A way to confirm email changes by users
+[x] Auto identify through SSL key
+[x] Optional os_login system that can also use SSL keys.
+[x] os_info module to show useful configuration settings to services opers.
+[x] Remove nick requests. Instead use an unconfirmed nick group which cant recieve umode +r and auto expires after 1d?
+[x] LDAP
+
 Future
 ------
 [ ] NS IDENTIFY changes
   [?] Last failed identify? Maybe more useful for sopers only, so users don't get unnecessarily worried
   [?] Last successful login time/ip? perhaps both of these should be a new nick setting
+[ ] NS INFO: seperate field for last seen realhost, shown to SRA only
 [ ] NS SUSPEND: show suspender and reason, probably to sopers only (see CS SUSPEND)
 [ ] Allow channel founders to change the fantasy trigger for their channel.
-[+] CIDR Akills, session exceptions, etc
+[ ] CIDR Akills, session exceptions, etc
 [?] Language charset stuff, including collation (1.9.1? phoenix?)
 [?] a way for a module to queue itself (or even another module) for unloading
-[+] Useful/common "third party" modules to core distro
-  [x] NS AJOIN
+[ ] Useful/common "third party" modules to core distro
+  [ ] NS AJOIN
   [x] CS ENTRYMSG
 [?] Don't allow soper accounts to expire
 [?] Reason for CS SET RESTRICTED
-[ ] Unique IDs on each AKILL/blah so that networks may use them as ticket IDs
+[x] AKILL/SGLINE/etc..
+  [x] Setter
+  [x] Time added
+  [+] Time modified (can they be modified?)
+  [x] Time until expiry/expiry time (YES, time until expiry *instead of* expiry time, more human)
+  [x] Reason
+  [ ] Unique IDs on each AKILL/blah so that networks may use them as ticket IDs
 [ ] HS ACTIVATE -ALL (rob sez this all needs reviewing)
-[ ] No nickname ownership?
-[ ] More commands need to be split up such as /bs bot, /ms set, /bs kick, /bs set, /os set? etc.
-[ ] Customize email messages

docs/WIN32.txt

@@ -26,16 +26,36 @@ Anope for Windows
         (NOTE: When installing, tell CMake to add itself to the PATH.)
 
         If you have Visual C++ 10 (2010) skip ahead to step 2, else you
-        need to download the following free component from Microsoft. Once
+        need to download the following free components from Microsoft. Once
         downloaded, install these packages.
 
         * Microsoft Visual C++ 2010 Express Edition:
             http://www.microsoft.com/express/vc/
 
+        or
+
+        then download and install:
+
+        * Microsoft Windows 2008 SDK:
+            http://www.microsoft.com/downloads/details.aspx?FamilyId=E6E1C3DF-A74F-4207-8586-711EBE331CDC&displaylang=en
+
+        (NOTE: Although they say for Windows Server 2003 or 2008, they do infact work on all supported
+        versions of Windows. When installing the 2003 SDK, you should select the Custom option, and only select
+        to have the Microsoft Windows Core SDK installed. When installing the 2008 SDK, you should select the
+        Custom option, and only select to have the Developer Tools installed, but also expand that and deselect
+        the Visual C++ Compilers as well as the Mobile Tools. Doing this will decrease the install time as well
+        as the space used by the SDK.)
+
     2) Unpack the Anope tarball with your favorite uncompression program
        (WinZip or WinRAR, etc).
 
-    3) Bring up the Visual C++ Command Prompt; This will launch a
+    3) (Note before this step: If you fall under one of the situations at the end of Step 1 where it says that the
+       SDK will not work out of the box, do not bring up the Visual C++ Command Prompt by using the link in
+       the Windows Start Menu. Instead, edit vsvars32.bat in the directory where you unpacked the source code
+       in step 2, so the first line that says "@SET VSINSTALLDIR=<whatever>" has the directory where you installed
+       Visual C++ Express to, if different from the default. Save the file and then run it instead.)
+
+       Bring up the Visual C++ Command Prompt; This will launch a
        DOS Command Prompt like window, which will set the environment
        properties needed to make Anope.
 

docs/XMLRPC/xmlrpc.php

@@ -1,7 +1,7 @@
 <?php
 /* XMLRPC Functions
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  */

include/CMakeLists.txt

@@ -4,10 +4,9 @@ set_source_files_properties(version.cpp PROPERTIES LANGUAGE CXX COMPILE_FLAGS "$
 add_executable(version version.cpp)
 set_target_properties(version PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
 get_target_property(version_BINARY version LOCATION)
-# Modify version.h from the above executable, with dependencies to version.cpp
-# and all of the source files in the main build
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_build
-  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR}/src/version.sh ${CMAKE_CURRENT_BINARY_DIR}/version.h
+# Modify version.h from the above executable, with dependencies to the given headers, version.cpp, and all source files in the main Anope build
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.h
+  COMMAND ${version_BINARY} ${Anope_SOURCE_DIR}/src/version.sh ${CMAKE_CURRENT_SOURCE_DIR}/version.h
   DEPENDS version ${SRC_SRCS}
 )
 # Add version to list of files for CPack to ignore
@@ -45,4 +44,4 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # Add a custom target to the above file
-add_custom_target(headers DEPENDS version ${CMAKE_CURRENT_BINARY_DIR}/version_build ${PCH_SOURCES_GCH})
+add_custom_target(headers DEPENDS version ${CMAKE_CURRENT_BINARY_DIR}/version.h ${PCH_SOURCES_GCH})

include/access.h

@@ -1,85 +0,0 @@
-#ifndef ACCESS_H
-#define ACCESS_H
-
-enum
-{
-	ACCESS_INVALID = -10000,
-	ACCESS_FOUNDER = 10001
-};
-
-struct CoreExport Privilege
-{
-	Anope::string name;
-	Anope::string desc;
-	int rank;
-
-	Privilege(const Anope::string &n, const Anope::string &d, int r);
-	bool operator==(const Privilege &other) const;
-};
-
-class CoreExport PrivilegeManager
-{
-	static std::vector<Privilege> privs;
- public:
-	static void AddPrivilege(Privilege p);
-	static void RemovePrivilege(Privilege &p);
-	static Privilege *FindPrivilege(const Anope::string &name);
-	static std::vector<Privilege> &GetPrivileges();
-	static void ClearPrivileges();
-};
-
-class ChanAccess;
-
-class CoreExport AccessProvider : public Service
-{
- public:
-	AccessProvider(Module *o, const Anope::string &n);
-	virtual ~AccessProvider();
-	virtual ChanAccess *Create() = 0;
-};
-
-class CoreExport ChanAccess : public Serializable
-{
- public:
-	AccessProvider *provider;
-	ChannelInfo *ci;
-	Anope::string mask;
-	Anope::string creator;
-	time_t last_seen;
-	time_t created;
-
-	ChanAccess(AccessProvider *p);
-	virtual ~ChanAccess();
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
-	virtual bool Matches(User *u, NickCore *nc);
-	virtual bool HasPriv(const Anope::string &name) const = 0;
-	virtual Anope::string Serialize() = 0;
-	virtual void Unserialize(const Anope::string &data) = 0;
-
-	bool operator>(const ChanAccess &other) const;
-	bool operator<(const ChanAccess &other) const;
-	bool operator>=(const ChanAccess &other) const;
-	bool operator<=(const ChanAccess &other) const;
-};
-
-class CoreExport AccessGroup : public std::vector<ChanAccess *>
-{
- public:
- 	ChannelInfo *ci;
-	NickCore *nc;
-	bool SuperAdmin, Founder;
-	AccessGroup();
-	bool HasPriv(const Anope::string &priv) const;
-	ChanAccess *Highest() const;
-	bool operator>(const AccessGroup &other) const;
-	bool operator<(const AccessGroup &other) const;
-	bool operator>=(const AccessGroup &other) const;
-	bool operator<=(const AccessGroup &other) const;
-};
-
-#endif
-

include/account.h

@@ -6,8 +6,8 @@
 class NickAlias;
 class NickCore;
 
-typedef Anope::insensitive_map<NickAlias *> nickalias_map;
-typedef Anope::insensitive_map<NickCore *> nickcore_map;
+typedef unordered_map_namespace::unordered_map<Anope::string, NickAlias *, ci::hash, std::equal_to<ci::string> > nickalias_map;
+typedef unordered_map_namespace::unordered_map<Anope::string, NickCore *, ci::hash, std::equal_to<ci::string> > nickcore_map;
 
 extern CoreExport nickalias_map NickAliasList;
 extern CoreExport nickcore_map NickCoreList;
@@ -20,6 +20,8 @@ enum NickNameFlag
 {
 	NS_BEGIN,
 
+	/* Nick may not be registered or used */
+	NS_FORBIDDEN,
 	/* Nick never expires */
 	NS_NO_EXPIRE,
 	/* This nick is being held after a kill by an enforcer client
@@ -37,7 +39,7 @@ enum NickNameFlag
 };
 
 const Anope::string NickNameFlagStrings[] = {
-	"BEGIN", "NO_EXPIRE", "HELD", "COLLIDED", ""
+	"BEGIN", "FORBIDDEN", "NO_EXPIRE", "HELD", "COLLIDED", ""
 };
 
 /** Flags set on NickCores
@@ -93,7 +95,9 @@ const Anope::string NickCoreFlagStrings[] = {
 	"MEMO_MAIL", "HIDE_STATUS", "SUSPENDED", "AUTOOP", "FORBIDDEN", "UNCONFIRMED", ""
 };
 
-class CoreExport NickAlias : public Extensible, public Flags<NickNameFlag, NS_END>, public Serializable
+class NickCore;
+
+class CoreExport NickAlias : public Extensible, public Flags<NickNameFlag, NS_END>
 {
  public:
  	/** Default constructor
@@ -110,16 +114,11 @@ class CoreExport NickAlias : public Extensible, public Flags<NickNameFlag, NS_EN
 	Anope::string last_quit;		/* Last quit message */
 	Anope::string last_realname;	/* Last realname */
 	Anope::string last_usermask;	/* Last usermask */
-	Anope::string last_realhost;	/* Last uncloaked usermask, requires nickserv/auspex to see */
 	time_t time_registered;			/* When the nick was registered */
 	time_t last_seen;				/* When it was seen online for the last time */
 	NickCore *nc;					/* I'm an alias of this */
 	HostInfo hostinfo;
 
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
 	/** Release a nick
 	 * See the comment in users.cpp
 	 */
@@ -133,7 +132,7 @@ class CoreExport NickAlias : public Extensible, public Flags<NickNameFlag, NS_EN
 	void OnCancel(User *u);
 };
 
-class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END>, public Serializable
+class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END>
 {
  public:
 	/** Default constructor
@@ -155,18 +154,14 @@ class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END
 	std::vector<Anope::string> access; /* Access list, vector of strings */
 	std::vector<Anope::string> cert; /* ssl certificate list, vector of strings */
 	MemoInfo memos;
+	uint16 channelcount; /* Number of channels currently registered */
 
 	Oper *o;
 
 	/* Unsaved data */
-	uint16_t channelcount; /* Number of channels currently registered */
 	time_t lastmail;				/* Last time this nick record got a mail */
 	std::list<NickAlias *> aliases;	/* List of aliases */
 
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
 	/** Checks whether this account is a services oper or not.
 	 * @return True if this account is a services oper, false otherwise.
 	 */
@@ -256,7 +251,7 @@ class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END
 
 /** Timer for colliding nicks to force people off of nicknames
  */
-class CoreExport NickServCollide : public Timer
+class NickServCollide : public Timer
 {
 	dynamic_reference<User> u;
 	Anope::string nick;
@@ -278,23 +273,9 @@ class CoreExport NickServCollide : public Timer
 	void Tick(time_t t);
 };
 
-/** Timers for removing HELD status from nicks.
- */
-class NickServHeld : public Timer
-{
-	dynamic_reference<NickAlias> na;
-	Anope::string nick;
- public:
- 	NickServHeld(NickAlias *n, long t);
-
-	~NickServHeld();
-
-	void Tick(time_t);
-};
-
 /** Timers for releasing nicks to be available for use
  */
-class CoreExport NickServRelease : public User, public Timer
+class NickServRelease : public User, public Timer
 {
 	Anope::string nick;
 

include/anope.h

@@ -1,5 +1,5 @@
 /*
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -21,7 +21,7 @@ class Message;
 namespace Anope
 {
 	template<typename T> class map : public std::map<string, T> { };
-	template<typename T> class insensitive_map : public std::map<string, T, ci::less> { };
+	template<typename T> class insensitive_map : public std::map<string, T, std::less<ci::string> > { };
 
 	/**
 	 * A wrapper string class around all the other string classes, this class will
@@ -156,12 +156,6 @@ namespace Anope
 		 */
 		inline size_type length() const { return this->_string.length(); }
 
-		/**
-		 * Returns the size of the currently allocated storage space in the string object.
-		 * This can be equal or greater than the length of the string.
-		 */
-		inline size_type capacity() const { return this->_string.capacity(); }
-
 		/**
 		 * Add a char to the end of the string.
 		 */
@@ -179,17 +173,6 @@ namespace Anope
 		inline iterator erase(const iterator &first, const iterator &last) { return this->_string.erase(first, last); }
 		inline void erase(size_type pos = 0, size_type n = std::string::npos) { this->_string.erase(pos, n); }
 
-		/**
-		 * Trim leading and trailing white spaces from the string.
-		 */
-		inline void trim()
-		{
-			while (!this->_string.empty() && isspace(this->_string[0]))
-				this->_string.erase(this->_string.begin());
-			while (!this->_string.empty() && isspace(this->_string[this->_string.length() - 1]))
-				this->_string.erase(this->_string.length() - 1);
-		}
-
 		/**
 		 * Clears the string.
 		 */
@@ -258,28 +241,6 @@ namespace Anope
 			return new_string;
 		}
 
-		/**
-		 * Get the string in lowercase.
-		 */
-		inline string lower()
-		{
-			Anope::string new_string = *this;
-			for (size_type i = 0; i < new_string.length(); ++i)
-				new_string[i] = static_cast<char>(tolower(new_string[i]));
-			return new_string;
-		}
-
-		/**
-		 * Get the string in uppercase.
-		 */
-		inline string upper()
-		{
-			Anope::string new_string = *this;
-			for (size_type i = 0; i < new_string.length(); ++i)
-				new_string[i] = static_cast<char>(toupper(new_string[i]));
-			return new_string;
-		}
-
 		/**
 		 * Get a substring of the string.
 		 */
@@ -355,9 +316,9 @@ namespace Anope
 	 */
 	extern CoreExport bool Match(const Anope::string &str, const Anope::string &mask, bool case_sensitive = false);
 
-	/** Find a message in the message table
-	 * @param name The name of the message were looking for
-	 * @return NULL if we cant find it, or a pointer to the Message if we can
+	/** Returns a list of pointers to message handlers
+	 * @param The message name as sent by the IRCd
+	 * @return a vector with pointers to the messagehandlers (you can bind more than one handler to a message)
 	 */
 	extern CoreExport std::vector<Message *> FindMessage(const string &name);
 
@@ -374,18 +335,6 @@ namespace Anope
 	 */
 	extern CoreExport void Unhex(const Anope::string &src, Anope::string &dest);
 	extern CoreExport void Unhex(const Anope::string &src, char *dest);
-	
-	/** Base 64 encode a string
-	 * @param src The string to encode
-	 * @param target Where the encoded string is placed
-	 */
-	extern CoreExport void B64Encode(const Anope::string &src, Anope::string &target);
-	
-	/** Base 64 decode a string
-	 * @param src The base64 encoded string
-	 * @param target The plain text result
-	 */
-	extern CoreExport void B64Decode(const Anope::string &src, Anope::string &target);
 
 	/** Returns a sequence of data formatted as the format argument specifies.
 	 ** After the format parameter, the function expects at least as many
@@ -396,12 +345,7 @@ namespace Anope
 	 */
 	extern CoreExport string printf(const char *fmt, ...);
 
-	/** Return the last error code
-	 * @return The error code
-	 */
-	extern CoreExport int LastErrorCode();
-
-	/** Return the last error, uses errno/GetLastError() to determine this
+	/** Return the last error, uses errno/GetLastError() to determin this
 	 * @return An error message
 	 */
 	extern CoreExport const Anope::string LastError();
@@ -484,7 +428,7 @@ class CoreExport Base
 	void DelReference(dynamic_reference_base *r);
 };
 
-class dynamic_reference_base
+class dynamic_reference_base : public Base
 {
  protected:
 	bool invalid;
@@ -506,12 +450,6 @@ class dynamic_reference : public dynamic_reference_base
 			ref->AddReference(this);
 	}
 
-	dynamic_reference(const dynamic_reference<T> &obj) : ref(obj.ref)
-	{
-		if (ref)
-			ref->AddReference(this);
-	}
-
 	virtual ~dynamic_reference()
 	{
 		if (this->invalid)
@@ -519,7 +457,7 @@ class dynamic_reference : public dynamic_reference_base
 			this->invalid = false;
 			this->ref = NULL;
 		}
-		else if (this->operator bool())
+		else if (ref)
 			ref->DelReference(this);
 	}
 
@@ -530,21 +468,7 @@ class dynamic_reference : public dynamic_reference_base
 			this->invalid = false;
 			this->ref = NULL;
 		}
-		return this->ref != NULL;
-	}
-
-	virtual inline operator T*()
-	{
-		if (this->operator bool())
-			return this->ref;
-		return NULL;
-	}
-
-	virtual inline T *operator->()
-	{
-		if (this->operator bool())
-			return this->ref;
-		return NULL;
+		return this->ref;
 	}
 
 	virtual inline void operator=(T *newref)
@@ -554,12 +478,22 @@ class dynamic_reference : public dynamic_reference_base
 			this->invalid = false;
 			this->ref = NULL;
 		}
-		else if (this->operator bool())
+		else if (this->ref)
 			this->ref->DelReference(this);
 		this->ref = newref;
-		if (this->operator bool())
+		if (this->ref)
 			this->ref->AddReference(this);
 	}
+
+	virtual inline T *operator->()
+	{
+		return this->ref;
+	}
+
+	virtual inline T *operator*()
+	{
+		return this->ref;
+	}
 };
 
 #endif // ANOPE_H

include/bots.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2011 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -8,11 +8,12 @@
 #ifndef BOTS_H
 #define BOTS_H
 
+#include "commands.h"
+
 class BotInfo;
 
 extern CoreExport Anope::insensitive_map<BotInfo *> BotListByNick;
 extern CoreExport Anope::map<BotInfo *> BotListByUID;
-typedef Anope::insensitive_map<BotInfo *> botinfo_map;
 
 /** Flags settable on a bot
  */
@@ -24,45 +25,32 @@ enum BotFlag
 	BI_CORE,
 	/* This bot can only be assigned by IRCops */
 	BI_PRIVATE,
-	/* This bot is defined in the config */
-	BI_CONF,
 
 	BI_END
 };
 
-static const Anope::string BotFlagString[] = { "BEGIN", "CORE", "PRIVATE", "CONF", "" };
+static const Anope::string BotFlagString[] = { "BEGIN", "CORE", "PRIVATE", "" };
 
-class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Serializable
+class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>
 {
  public:
-	uint32_t chancount;
+	uint32 chancount;
 	time_t created;			/* Birth date ;) */
 	time_t lastmsg;			/* Last time we said something */
-	typedef Anope::insensitive_map<CommandInfo> command_map;
-	command_map commands; /* Commands, actual name to service name */
-	Anope::string botmodes;		/* Modes the bot should have as configured in service:modes */
-	std::vector<Anope::string> botchannels;	/* Channels the bot should be in as configured in service:channels */
-	bool introduced;		/* Whether or not this bot is introduced */
+	CommandMap Commands;	/* Commands on this bot */
 
 	/** Create a new bot.
 	 * @param nick The nickname to assign to the bot.
 	 * @param user The ident to give the bot.
 	 * @param host The hostname to give the bot.
 	 * @param real The realname to give the bot.
-	 * @param bmodes The modes to give the bot.
 	 */
-	BotInfo(const Anope::string &nick, const Anope::string &user = "", const Anope::string &host = "", const Anope::string &real = "", const Anope::string &bmodes = "");
+	BotInfo(const Anope::string &nick, const Anope::string &user = "", const Anope::string &host = "", const Anope::string &real = "");
 
 	/** Destroy a bot, clearing up appropriately.
 	 */
 	virtual ~BotInfo();
 
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
-	void GenerateUID();
-
 	/** Change the nickname for the bot.
 	 * @param newnick The nick to change to
 	 */
@@ -102,25 +90,6 @@ class CoreExport BotInfo : public User, public Flags<BotFlag, BI_END>, public Se
 	 * @param reason The reason we're parting
 	 */
 	void Part(Channel *c, const Anope::string &reason = "");
-
-	/** Called when a user messages this bot
-	 * @param u The user
-	 * @param message The users' message
-	 */
-	virtual void OnMessage(User *u, const Anope::string &message);
-
-	/** Link a command name to a command in services
-	 * @param cname The command name
-	 * @param sname The service name
-	 * @param permission Permission required to execute the command, if any
-	 */
-	void SetCommand(const Anope::string &cname, const Anope::string &sname, const Anope::string &permission = "");
-
-	/** Get command info for a command
-	 * @param cname The command name
-	 * @return A struct containing service name and permission
-	 */
-	CommandInfo *GetCommand(const Anope::string &cname);
 };
 
 #endif // BOTS_H

include/channels.h

@@ -1,6 +1,6 @@
 /* Channel support
  *
- * (C) 2008-2012 Anope Team
+ * (C) 2008-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,12 +9,41 @@
 #ifndef CHANNELS_H
 #define CHANNELS_H
 
-typedef Anope::insensitive_map<Channel *> channel_map;
+typedef unordered_map_namespace::unordered_map<Anope::string, Channel *, ci::hash, std::equal_to<ci::string> > channel_map;
 extern CoreExport channel_map ChannelList;
 
-struct UserContainer : public Extensible
+struct UserData
+{
+	UserData()
+	{
+		Clear();
+	}
+
+	virtual ~UserData() { }
+
+	void Clear()
+	{
+		last_use = last_start = Anope::CurTime;
+		lines = times = 0;
+		lastline.clear();
+	}
+
+	/* Data validity */
+	time_t last_use;
+
+	/* for flood kicker */
+	int16 lines;
+	time_t last_start;
+
+	/* for repeat kicker */
+	Anope::string lastline;
+	int16 times;
+};
+
+struct UserContainer
 {
 	User *user;
+	UserData ud;
 	ChannelStatus *Status;
 
 	UserContainer(User *u) : user(u) { }
@@ -25,16 +54,14 @@ typedef std::list<UserContainer *> CUserList;
 
 enum ChannelFlag
 {
-	/* ChanServ is currently holding the channel */
-	CH_INHABIT,
 	/* Channel still exists when emptied */
 	CH_PERSIST,
 	/* If set the channel is syncing users (channel was just created) and it should not be deleted */
-	CH_SYNCING
+	CH_SYNCING,
+	/* Is a services log channel */
+	CH_LOGCHAN
 };
 
-const Anope::string ChannelFlagString[] = { "CH_INABIT", "CH_PERSIST", "CH_SYNCING", "" };
-
 class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 {
  public:
@@ -43,7 +70,7 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 	/** A map of channel modes with their parameters set on this channel
 	 */
 	ModeList modes;
-
+	
  public:
 	/** Default constructor
 	 * @param name The channel name
@@ -66,11 +93,13 @@ class CoreExport Channel : public Extensible, public Flags<ChannelFlag, 3>
 	Anope::string topic_setter;	/* Who set the topic */
 	time_t topic_time;		/* When the topic was set*/
 
+	std::list<BanData *> bd;
+
 	time_t server_modetime;		/* Time of last server MODE */
 	time_t chanserv_modetime;	/* Time of last check_modes() */
-	int16_t server_modecount;	/* Number of server MODEs this second */
-	int16_t chanserv_modecount;	/* Number of check_mode()'s this sec */
-	int16_t bouncy_modes;		/* Did we fail to set modes here? */
+	int16 server_modecount;		/* Number of server MODEs this second */
+	int16 chanserv_modecount;	/* Number of check_mode()'s this sec */
+	int16 bouncy_modes;			/* Did we fail to set modes here? */
 
 	/** Call if we need to unset all modes and clear all user status (internally).
 	 * Only useful if we get a SJOIN with a TS older than what we have here

include/commands.h

@@ -1,6 +1,6 @@
 /* Declarations for command data.
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -18,89 +18,103 @@ class Module;
 class BotInfo;
 class Command;
 
+typedef std::map<Anope::string, Command *, std::less<ci::string> > CommandMap;
+
+/** The return value from commands.
+ */
+enum CommandReturn
+{
+	MOD_CONT,
+	MOD_STOP
+};
+
+extern CoreExport Command *FindCommand(BotInfo *bi, const Anope::string &cmd);
+extern CoreExport void mod_help_cmd(BotInfo *bi, User *u, ChannelInfo *ci, const Anope::string &cmd);
+extern CoreExport void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, const Anope::string &message);
+extern CoreExport void mod_run_cmd(BotInfo *bi, User *u, ChannelInfo *ci, Command *c, const Anope::string &command, const Anope::string &message);
+
 enum CommandFlag
 {
 	CFLAG_ALLOW_UNREGISTERED,
-	CFLAG_STRIP_CHANNEL
+	CFLAG_ALLOW_FORBIDDEN,
+	CFLAG_ALLOW_SUSPENDED,
+	CFLAG_ALLOW_UNREGISTEREDCHANNEL,
+	CFLAG_STRIP_CHANNEL,
+	CFLAG_DISABLE_FANTASY
 };
 
 const Anope::string CommandFlagStrings[] = {
 	"CFLAG_ALLOW_UNREGISTERED",
+	"CFLAG_ALLOW_FORBIDDEN",
+	"CFLAG_ALLOW_SUSPENDED",
+	"CFLAG_ALLOW_UNREGISTEREDCHANNEL",
 	"CFLAG_STRIP_CHANNEL",
+	"CFLAG_DISABLE_FANTASY",
 	""
 };
 
-struct CommandInfo
-{
-	Anope::string name;
-	Anope::string permission;
-};
-
 /* The source for a command */
 struct CoreExport CommandSource
 {
 	/* User executing the command */
 	User *u;
-	/* Channel the command was executed on (fantasy) */
-	Channel *c;
+	/* Channel (if applicable) */
+	ChannelInfo *ci;
 	/* The service this command is on */
 	BotInfo *owner;
 	/* The service the reply should come from, *not* necessarily the service the command is on */
 	BotInfo *service;
-	/* The actual name of the command being executed */
-	Anope::string command;
-	/* The permission of the command being executed */
-	Anope::string permission;
+	/* Whether or not this was a fantasy command */
+	bool fantasy;
+
+	std::list<Anope::string> reply;
 
 	void Reply(const char *message, ...);
 	void Reply(const Anope::string &message);
+
+	void DoReply();
 };
 
 /** Every services command is a class, inheriting from Command.
  */
-class CoreExport Command : public Service, public Flags<CommandFlag>
+class CoreExport Command : public Flags<CommandFlag>, public Base
 {
 	Anope::string desc;
-	std::vector<Anope::string> syntax;
 
  public:
  	/* Maximum paramaters accepted by this command */
 	size_t MaxParams;
 	/* Minimum parameters required to use this command */
 	size_t MinParams;
+	/* Command name */
+	Anope::string name;
+	/* Permission needed to use this comand */
+	Anope::string permission;
 
 	/* Module which owns us */
 	Module *module;
+	/* Service this command is on */
+	BotInfo *service;
 
 	/** Create a new command.
-	 * @param owner The owner of the command
 	 * @param sname The command name
 	 * @param min_params The minimum number of parameters the parser will require to execute this command
 	 * @param max_params The maximum number of parameters the parser will create, after max_params, all will be combined into the last argument.
 	 * NOTE: If max_params is not set (default), there is no limit to the max number of params.
 	 */
-	Command(Module *owner, const Anope::string &sname, size_t min_params, size_t max_params = 0);
+	Command(const Anope::string &sname, size_t min_params, size_t max_params = 0, const Anope::string &spermission = "");
 
 	virtual ~Command();
 
  protected:
 	void SetDesc(const Anope::string &d);
 
-	void ClearSyntax();
-	void SetSyntax(const Anope::string &s);
-	void SendSyntax(CommandSource &);
-	void SendSyntax(CommandSource &, const Anope::string &syntax);
  public:
- 	/** Get the command description
-	 * @return The commands description
-	 */
- 	const Anope::string &GetDesc() const;
-
 	/** Execute this command.
 	 * @param source The source
 	 * @param params Command parameters
 	 */
-	virtual void Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;
+	virtual CommandReturn Execute(CommandSource &source, const std::vector<Anope::string> &params) = 0;
 
 	/** Called when HELP is requsted for the client this command is on.
 	 * @param source The source
@@ -119,6 +133,28 @@ class CoreExport Command : public Service, public Flags<CommandFlag>
 	 * @param subcommand The subcommand the user tried to use
 	 */
 	virtual void OnSyntaxError(CommandSource &source, const Anope::string &subcommand);
+
+	/** Set which command permission (e.g. chanserv/forbid) is required for this command.
+	 * @param reststr The permission required to successfully execute this command
+	 */
+	void SetPermission(const Anope::string &reststr);
+
+	/** Add a subcommand to this command
+	 * @param creator The creator of the subcommand
+	 * @param c The command
+	 */
+	virtual bool AddSubcommand(Module *creator, Command *c);
+
+	/** Delete a subcommand from this command
+	 * @param c The command
+	 */
+	virtual bool DelSubcommand(Command *c);
+
+	/** Find a subcommand
+	 * @param name The subcommand name
+	 * @return The subcommand
+	 */
+	virtual Command *FindSubcommand(const Anope::string &subcommand);
 };
 
 #endif // COMMANDS_H

include/config.h

@@ -33,6 +33,7 @@ enum ConfigDataType
 	DT_INTEGER, // Integer
 	DT_UINTEGER, // Unsigned Integer
 	DT_LUINTEGER, // Long Unsigned Integer
+	DT_CHARPTR, // Char pointer
 	DT_STRING, // Anope::string
 	DT_BOOLEAN, // Boolean
 	DT_HOSTNAME, // Hostname syntax
@@ -41,8 +42,7 @@ enum ConfigDataType
 	DT_TIME, // Time value
 	DT_NORELOAD = 32, // Item can't be reloaded after startup
 	DT_ALLOW_WILD = 64, // Allow wildcards/CIDR in DT_IPADDRESS
-	DT_ALLOW_NEWLINE = 128, // New line characters allowed in DT_STRING
-	DT_ALLOW_EMPTY = 256 // Allow empty value
+	DT_ALLOW_NEWLINE = 128 // New line characters allowed in DT_CHARPTR
 };
 
 /** Holds a config value, either string, integer or boolean.
@@ -57,16 +57,28 @@ class CoreExport ValueItem
 	/** Actual data */
 	Anope::string v;
  public:
- 	/** Initialize with nothing */
- 	ValueItem();
 	/** Initialize with an int */
 	ValueItem(int);
 	/** Initialize with a bool */
 	ValueItem(bool);
+	/** Initialize with a char pointer */
+	ValueItem(const char *);
+	/** Initialize with an std::string */
+	ValueItem(const std::string &);
+	/** Initialize with a ci::string */
+	ValueItem(const ci::string &);
 	/** Initialize with an Anope::string */
 	ValueItem(const Anope::string &);
 	/** Initialize with a long */
 	ValueItem(long);
+	/** Change value to a char pointer */
+	//void Set(char *);
+	/** Change value to a const char pointer */
+	void Set(const char *);
+	/** Change value to an std::string */
+	void Set(const std::string &);
+	/** Change value to a ci::string */
+	void Set(const ci::string &);
 	/** Change value to an Anope::string */
 	void Set(const Anope::string &);
 	/** Change value to an int */
@@ -125,6 +137,40 @@ template<typename T> class ValueContainer : public ValueContainerBase
 	}
 };
 
+/** This a specific version of ValueContainer to handle character arrays specially
+ */
+template<> class ValueContainer<char **> : public ValueContainerBase
+{
+ private:
+	/** Contained item */
+	char **val;
+ public:
+	/** Initialize with nothing */
+	ValueContainer() : ValueContainerBase(), val(NULL) { }
+	/** Initialize with a value of type T */
+	ValueContainer(char **Val) : ValueContainerBase(), val(Val) { }
+	/** Initialize with a copy */
+	ValueContainer(const ValueContainer &Val) : ValueContainerBase(), val(Val.val) { }
+	ValueContainer &operator=(const ValueContainer &Val)
+	{
+		val = Val.val;
+		return *this;
+	}
+	/** Change value to type T of size s */
+	void Set(const char *newval, size_t s)
+	{
+		if (*val)
+			delete [] *val;
+		if (!*newval)
+		{
+			*val = NULL;
+			return;
+		}
+		*val = new char[s];
+		strlcpy(*val, newval, s);
+	}
+};
+
 /** This a specific version of ValueContainer to handle Anope::string specially
  */
 template<> class ValueContainer<Anope::string *> : public ValueContainerBase
@@ -171,6 +217,11 @@ typedef ValueContainer<unsigned *> ValueContainerUInt;
  */
 typedef ValueContainer<long unsigned *> ValueContainerLUInt;
 
+/** A specialization of ValueContainer to hold a pointer to
+ * a char array.
+ */
+typedef ValueContainer<char **> ValueContainerChar;
+
 /** A specialization of ValueContainer to hold a pointer to
  * an int
  */
@@ -213,6 +264,7 @@ bool ValidateHostServ(ServerConfig *config, const Anope::string &tag, const Anop
 bool ValidateLimitSessions(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
 bool ValidateOperServ(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
 bool ValidateGlobal(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
+bool ValidateDefCon(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
 bool ValidateNickLen(ServerConfig *, const Anope::string &, const Anope::string &, ValueItem &data);
 bool ValidateMail(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
 bool ValidateGlobalOnCycle(ServerConfig *config, const Anope::string &tag, const Anope::string &value, ValueItem &data);
@@ -343,15 +395,22 @@ class CoreExport ServerConfig
 
 	/** Below here is a list of variables which contain the config files values
 	 */
-	/* Host to bind to */
+	/* IRCd module in use */
+	Anope::string IRCDModule;
+
+	/* Host to connect to **/
 	Anope::string LocalHost;
 	/* List of uplink servers to try and connect to */
-	std::vector<Uplink *> Uplinks;
+	std::list<Uplink *> Uplinks;
 
 	/* Our server name */
 	Anope::string ServerName;
 	/* Our servers description */
 	Anope::string ServerDesc;
+	/* The username/ident of services clients */
+	Anope::string ServiceUser;
+	/* The hostname if services clients */
+	Anope::string ServiceHost;
 
 	/* Name of the network were on */
 	Anope::string NetworkName;
@@ -365,19 +424,41 @@ class CoreExport ServerConfig
 	/* Max length of passwords */
 	unsigned PassLen;
 
+	/* NickServ Name */
+	Anope::string s_NickServ;
+	/* ChanServ Name */
+	Anope::string s_ChanServ;
+	/* MemoServ Name */
+	Anope::string s_MemoServ;
+	/* BotServ Name */
+	Anope::string s_BotServ;
+	/* OperServ name */
+	Anope::string s_OperServ;
+	/* Global name */
+	Anope::string s_GlobalNoticer;
+	/* NickServs realname */
+	Anope::string desc_NickServ;
+	/* ChanServ realname */
+	Anope::string desc_ChanServ;
+	/* MemoServ realname */
+	Anope::string desc_MemoServ;
+	/* BotServ realname */
+	Anope::string desc_BotServ;
+	/* OperServ realname */
+	Anope::string desc_OperServ;
+	/* Global realname */
+	Anope::string desc_GlobalNoticer;
+
+	/* HostServ Name */
+	Anope::string s_HostServ;
+	/* HostServ realname */
+	Anope::string desc_HostServ;
+
 	/* Filename for the PID file */
 	Anope::string PIDFilename;
 	/* MOTD filename */
 	Anope::string MOTDFilename;
 
-	Anope::string BotServ;
-	Anope::string ChanServ;
-	Anope::string Global;
-	Anope::string HostServ;
-	Anope::string NickServ;
-	Anope::string OperServ;
-	Anope::string MemoServ;
-
 	/* True if its ok to not be able to save backs */
 	bool NoBackupOkay;
 	/* Do password checking when new people register */
@@ -420,12 +501,12 @@ class CoreExport ServerConfig
 	Anope::string BotModes;
 	/* THe actual modes */
 	ChannelStatus BotModeList;
+	/* How many times to try and reconnect to the uplink before giving up */
+	unsigned MaxRetries;
 	/* How long to wait between connection attempts */
 	int RetryWait;
 	/* If services should hide unprivileged commands */
 	bool HidePrivilegedCommands;
-	/* If set, nicks cant be owned/everything is entirely account based */
-	bool NoNicknameOwnership;
 
 	/* A vector of our logfile options */
 	std::vector<LogInfo *> LogInfos;
@@ -442,12 +523,6 @@ class CoreExport ServerConfig
 	time_t MailDelay;
 	/* Don't quote the To: address */
 	bool DontQuoteAddresses;
-	/* Mail messages to send */
-	Anope::string MailRegistrationSubject, MailRegistrationMessage;
-	Anope::string MailResetSubject, MailResetMessage;
-	Anope::string MailSendpassSubject, MailSendpassMessage;
-	Anope::string MailEmailchangeSubject, MailEmailchangeMessage;
-	Anope::string MailMemoSubject, MailMemoMessage;
 
 	/* Nameserver to use for resolving hostnames */
 	Anope::string NameServer;
@@ -475,6 +550,8 @@ class CoreExport ServerConfig
 	time_t NSExpire;
 	/* How long before suspended nicks expire */
 	time_t NSSuspendExpire;
+	/* How long before forbidden nicks expire */
+	time_t NSForbidExpire;
 	/* Time before unconfirmed nicks expire */
 	time_t NSUnconfirmedExpire;
 	/* Force email when registering */
@@ -491,6 +568,8 @@ class CoreExport ServerConfig
 	Anope::string NSEnforcerHost;
 	/* How long before recovered nicks are released */
 	time_t NSReleaseTimeout;
+	/* /nickserv list is oper only */
+	bool NSListOpersOnly;
 	/* Max number of entries that can be returned from the list command */
 	unsigned NSListMax;
 	/* Only allow usermode +a etc on real services admins */
@@ -499,8 +578,6 @@ class CoreExport ServerConfig
 	bool NSStrictPrivileges;
 	/* Use email to verify new users registering */
 	bool NSEmailReg;
-	/* Core NickServ modules */
-	Anope::string NickCoreModules;
 	/* Set the proper channel modes on users when they identify */
 	bool NSModeOnID;
 	/* Add the users hostnask their access list when they register */
@@ -508,8 +585,6 @@ class CoreExport ServerConfig
 	/* Maximum number of channels on AJoin */
 	unsigned AJoinMax;
 
-	/* Core ChanServ modules */
-	Anope::string ChanCoreModules;
 	/* Default flags for newly registered channels */
 	Flags<ChannelInfoFlag, CI_END> CSDefFlags;
 	/* Max number of channels a user can own */
@@ -530,6 +605,8 @@ class CoreExport ServerConfig
 	Anope::string CSAutokickReason;
 	/* Time ChanServ should stay in the channel to hold it to keep users from getting in */
 	time_t CSInhabit;
+	/* ChanServ's LIST command is oper only */
+	bool CSListOpersOnly;
 	/* Max number of entries allowed to be returned from the LIST command */
 	unsigned CSListMax;
 	/* true to make ChanServ oper only */
@@ -544,16 +621,7 @@ class CoreExport ServerConfig
 	/* Who can use memos reciepts */
 	unsigned MSMemoReceipt;
 
-	/* Valid chars allowed in vhosts */
-	Anope::string VhostChars;
-	/* Allow undotted vhosts? */
-	bool VhostUndotted;
-	/* Chars disallowed at the beginning or end of vhosts */
-	Anope::string VhostDisallowBE;
-
-	/* Core BotServ modules */
-	Anope::string BotCoreModules;
-	/* Default BotServ flags */
+	/* Defai;t BotServ flags */
 	Flags<BotServFlag> BSDefFlags;
 	/* How long before botserv forgets a user. This is used for flood kickers etc */
 	time_t BSKeepData;
@@ -592,6 +660,8 @@ class CoreExport ServerConfig
 	time_t SNLineExpiry;
 	/* Default expiry time for SQLines */
 	time_t SQLineExpiry;
+	/* Default expiry time for SZLine */
+	time_t SZLineExpiry;
 	/* Actually akill the user when the akill is added */
 	bool AkillOnAdd;
 	/* Kill users on SNLine */
@@ -608,12 +678,12 @@ class CoreExport ServerConfig
 	bool WallSNLineExpire;
 	/* Send a WALLOPS/GLOBOPS when SQLines expire */
 	bool WallSQLineExpire;
+	/* Send a WALLOPS/GLOBOPS when SZLines expire */
+	bool WallSZLineExpire;
 	/* Send a WALLOPS/GLOBOPS when exceptions expire */
 	bool WallExceptionExpire;
 	/* Add the akillers nick to the akill reason */
 	bool AddAkiller;
-	/* Add akill ids to akill reason */
-	bool AkillIds;
 
 	/* Limit sessions */
 	bool LimitSessions;
@@ -636,6 +706,46 @@ class CoreExport ServerConfig
 
 	/* List of modules to autoload */
 	std::list<Anope::string> ModulesAutoLoad;
+	/* Encryption modules */
+	std::list<Anope::string> EncModuleList;
+	/* Database modules */
+	std::list<Anope::string> DBModuleList;
+	/* HostServ Core Modules */
+	std::list<Anope::string> HostServCoreModules;
+	/* MemoServ Core Modules */
+	std::list<Anope::string> MemoServCoreModules;
+	/* BotServ Core Modules */
+	std::list<Anope::string> BotServCoreModules;
+	/* OperServ Core Modules */
+	std::list<Anope::string> OperServCoreModules;
+	/* NickServ Core Modules */
+	std::list<Anope::string> NickServCoreModules;
+	/* ChanServ Core Modules */
+	std::list<Anope::string> ChanServCoreModules;
+
+	/* Default defcon level */
+	int DefConLevel;
+	/* Timeout before defcon is reset */
+	time_t DefConTimeOut;
+	/* Session limiit to use when using defcon */
+	unsigned DefConSessionLimit;
+	/* How long to add akills for defcon */
+	time_t DefConAKILL;
+	/* Chan modes for defcon */
+	Anope::string DefConChanModes;
+	/* Should we global on defcon */
+	bool GlobalOnDefcon;
+	/* Should we send DefconMessage aswell? */
+	bool GlobalOnDefconMore;
+	/* Message to send when defcon is off */
+	Anope::string DefConOffMessage;
+	/* Message to send when defcon is on*/
+	Anope::string DefconMessage;
+	/* Reason to akill clients for defcon */
+	Anope::string DefConAkillReason;
+
+	/* The socket engine in use */
+	Anope::string SocketEngine;
 
 	/* User keys to use for generating random hashes for pass codes etc */
 	unsigned long UserKey1;

include/dns.h

@@ -19,7 +19,7 @@ enum QueryType
 
 /** Flags that can be AND'd into DNSPacket::flags to receive certain values
  */
-enum
+enum QueryFlags
 {
 	DNS_QUERYFLAGS_QR = 0x8000,
 	DNS_QUERYFLAGS_OPCODE = 0x7800,
@@ -48,45 +48,16 @@ enum DNSError
 	DNS_ERROR_INVALIDTYPE
 };
 
+class DNSRequestTimeout; // Forward declarations
+struct DNSRecord;
 class Module;
-struct DNSQuery;
-class DNSPacket;
-
-struct CoreExport Question
-{
-	Anope::string name;
-	QueryType type;
-	unsigned short qclass;
-
-	Question();
-	Question(const Anope::string &, QueryType, unsigned short = 1);
-};
-
-struct CoreExport ResourceRecord : public Question
-{
-	unsigned int ttl;
-	Anope::string rdata;
-	time_t created;
-
-	ResourceRecord(const Anope::string &, QueryType, unsigned short = 1);
-	ResourceRecord(const Question &);
-};
-
-struct CoreExport DNSQuery
-{
-	std::vector<Question> questions;
-	std::vector<ResourceRecord> answers, authorities, additional;
-	DNSError error;
-
-	DNSQuery();
-	DNSQuery(const Question &q);
-	DNSQuery(const DNSPacket &p);
-};
 
 /** The request
  */
-class CoreExport DNSRequest : public Timer, public Question
+class CoreExport DNSRequest
 {
+	/* Timeout timer for this request */
+	DNSRequestTimeout *timeout;
 	/* Use result cache if available */
 	bool use_cache;
 
@@ -96,93 +67,139 @@ class CoreExport DNSRequest : public Timer, public Question
  	/* Creator of this request */
 	Module *creator;
 
+	/* Address we're looking up */
+	Anope::string address;
+	/* QueryType, A, AAAA, PTR etc */
+	QueryType QT;
+
 	DNSRequest(const Anope::string &addr, QueryType qt, bool cache = false, Module *c = NULL);
 
 	virtual ~DNSRequest();
 
 	void Process();
 
-	virtual void OnLookupComplete(const DNSQuery *r) = 0;
+	virtual void OnLookupComplete(const DNSRecord *r) = 0;
 
-	virtual void OnError(const DNSQuery *r);
-	
-	void Tick(time_t);
+	virtual void OnError(const DNSRecord *r);
 };
 
-/** A full packet sent or recieved to/from the nameserver, may contain multiple queries
+/** A full packet sent to the nameserver, may contain multiple queries
  */
-class DNSPacket : public DNSQuery
+struct DNSPacket
 {
-	static const int DNS_POINTER = 0xC0;
-	static const int DNS_LABEL = 0x3F;
-
-	void PackName(unsigned char *output, unsigned short output_size, unsigned short &pos, const Anope::string &name);
-	Anope::string UnpackName(const unsigned char *input, unsigned short input_size, unsigned short &pos);
-	
-	Question UnpackQuestion(const unsigned char *input, unsigned short input_size, unsigned short &pos);
-	ResourceRecord UnpackResourceRecord(const unsigned char *input, unsigned short input_size, unsigned short &poss);
- public:
-	static const int HEADER_LENGTH = 12;
-
 	/* Our 16-bit id for this header */
 	unsigned short id;
 	/* Flags on the query */
 	unsigned short flags;
+	/* Number of queries */
+	unsigned short qdcount;
+	/* Number of resource records in answer */
+	unsigned short ancount;
+	/* Number of NS resource records in authority records section */
+	unsigned short nscount;
+	/* Number of resource records in the additional records section */
+	unsigned short arcount;
+	/* How many of the bytes of the payload are in use */
+	unsigned short payload_count;
+	/* The queries, at most can be 512 bytes */
+	unsigned char payload[512];
 
-	DNSPacket();
-	void Fill(const unsigned char *input, const unsigned short len);
-	unsigned short Pack(unsigned char *output, unsigned short output_size);
+	inline DNSPacket();
+
+	bool AddQuestion(const Anope::string &address, QueryType qt);
+
+	inline void FillPacket(const unsigned char *input, const size_t length);
+
+	inline void FillBuffer(unsigned char *buffer);
 };
 
-/** DNS manager, manages all requests
- */
-class CoreExport DNSManager : public Timer, public Socket
+struct CoreExport DNSRecord
 {
-	typedef std::multimap<Anope::string, ResourceRecord, ci::less> cache_map;
-	cache_map cache;
-	sockaddrs addrs;
+	/* Name of the initial lookup */
+	Anope::string name;
+	/* Result of the lookup */
+	Anope::string result;
+	/* Type of query this was */
+	QueryType type;
+	/* Error, if there was one */
+	DNSError error;
+	/* Record class, should always be 1 */
+	unsigned short record_class;
+	/* Time to live */
+	time_t ttl;
+	/* Record length */
+	unsigned short rdlength;
+
+	/* When this record was created in our cache */
+	time_t created;
+
+	inline DNSRecord(const Anope::string &n);
+	operator bool() const;
+};
+
+/** The socket used to talk to the nameserver, uses UDP
+ */
+class DNSSocket : public ConnectionSocket
+{
+ private:
+	int SendTo(const unsigned char *buf, size_t len) const;
+	int RecvFrom(char *buf, size_t size, sockaddrs &addrs) const;
+
  public:
+	DNSSocket();
+	virtual ~DNSSocket();
+
+	bool ProcessRead();
+
+	bool ProcessWrite();
+};
+
+/** DNS manager, manages the connection and all requests
+ */
+class CoreExport DNSManager : public Timer
+{
+	std::multimap<Anope::string, DNSRecord *> cache;
+ public:
+	DNSSocket *sock;
+
 	std::deque<DNSPacket *> packets;
 	std::map<short, DNSRequest *> requests;
 
 	static const int DNSPort = 53;
 
-	DNSManager(const Anope::string &nameserver, int port);
+	DNSManager();
 
 	~DNSManager();
 
-	bool ProcessRead();
-
-	bool ProcessWrite();
-
-	/** Add a record to the dns cache
-	 * @param r The record
-	 */
-	void AddCache(DNSQuery &r);
-
-	/** Check the DNS cache to see if request can be handled by a cached result
-	 * @return true if a cached result was found.
-	 */
+	void AddCache(DNSRecord *rr);
 	bool CheckCache(DNSRequest *request);
-
-	/** Tick this timer, used to clear the DNS cache.
-	 */
 	void Tick(time_t now);
 
-	/** Cleanup all pending DNS queries for a module
-	 * @param mod The module
-	 */
 	void Cleanup(Module *mod);
 
 	/** Does a BLOCKING DNS query and returns the first IP.
 	 * Only use this if you know what you are doing. Unless you specifically
 	 * need a blocking query use the DNSRequest system
 	 */
-	static DNSQuery BlockingQuery(const Anope::string &mask, QueryType qt);
+	static DNSRecord BlockingQuery(const Anope::string &mask, QueryType qt);
+};
+
+/** A DNS timeout, one is made for every DNS request to detect timeouts
+ */
+class DNSRequestTimeout : public Timer
+{
+	DNSRequest *request;
+ public:
+ 	bool done;
+
+	DNSRequestTimeout(DNSRequest *r, time_t timeout);
+
+	~DNSRequestTimeout();
+
+	void Tick(time_t);
 };
 
 extern DNSManager *DNSEngine;
 
 #endif // DNS_H
 
-

include/extensible.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2011 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -7,28 +7,61 @@
 #ifndef EXTENSIBLE_H
 #define EXTENSIBLE_H
 
-#include "anope.h"
 #include "hashcomp.h"
 
-class CoreExport ExtensibleItem
+/** Dummy base class we use to cast everything to/from
+ */
+class ExtensibleItemBase
 {
  public:
- 	ExtensibleItem();
-	virtual ~ExtensibleItem();
-	virtual void OnDelete();
+	ExtensibleItemBase() { }
+	virtual ~ExtensibleItemBase() { }
 };
 
-class ExtensibleString : public Anope::string, public ExtensibleItem
+/** Class used to represent an extensible item that doesn't hold a pointer
+ */
+template<typename T> class ExtensibleItemRegular : public ExtensibleItemBase
 {
+ protected:
+	T Item;
+
  public:
-	ExtensibleString(const Anope::string &s) : Anope::string(s), ExtensibleItem() { }
+	ExtensibleItemRegular(T item) : Item(item) { }
+	virtual ~ExtensibleItemRegular() { }
+	T &GetItem() { return Item; }
+};
+
+/** Class used to represent an extensible item that holds a pointer
+ */
+template<typename T> class ExtensibleItemPointer : public ExtensibleItemBase
+{
+ protected:
+	T *Item;
+
+ public:
+	ExtensibleItemPointer(T *item) : Item(item) { }
+	virtual ~ExtensibleItemPointer() { delete Item; }
+	T *GetItem() { return Item; }
+};
+
+/** Class used to represent an extensible item that holds a pointer to an arrray
+ */
+template<typename T> class ExtensibleItemPointerArray : public ExtensibleItemBase
+{
+ protected:
+	T *Item;
+
+ public:
+	ExtensibleItemPointerArray(T *item) : Item(item) { }
+	virtual ~ExtensibleItemPointerArray() { delete [] Item; }
+	T *GetItem() { return Item; }
 };
 
 class CoreExport Extensible : public Base
 {
  private:
- 	typedef Anope::map<ExtensibleItem *> extensible_map;
-	extensible_map extension_items;
+	typedef std::map<Anope::string, ExtensibleItemBase *> extensible_map;
+	extensible_map Extension_Items;
 
  public:
 	/** Default constructor, does nothing
@@ -40,10 +73,9 @@ class CoreExport Extensible : public Base
 	 */
 	virtual ~Extensible()
 	{
-		for (extensible_map::iterator it = extension_items.begin(), it_end = extension_items.end(); it != it_end; ++it)
-			if (it->second)
-				it->second->OnDelete();
-		extension_items.clear();
+		for (extensible_map::iterator it = Extension_Items.begin(), it_end = Extension_Items.end(); it != it_end; ++it)
+			delete it->second;
+		Extension_Items.clear();
 	}
 
 	/** Extend an Extensible class.
@@ -57,10 +89,26 @@ class CoreExport Extensible : public Base
 	 *
 	 * @return Returns true on success, false if otherwise
 	 */
-	void Extend(const Anope::string &key, ExtensibleItem *p)
+	void Extend(const Anope::string &key, ExtensibleItemBase *p)
 	{
 		this->Shrink(key);
-		this->extension_items[key] = p;
+		this->Extension_Items.insert(std::make_pair(key, p));
+	}
+
+	/** Extend an Extensible class.
+	 *
+	 * @param key The key parameter is an arbitary string which identifies the extension data
+	 *
+	 * You must provide a key to store the data as via the parameter 'key', this single-parameter
+	 * version takes no 'data' parameter, this is used purely for boolean values.
+	 * The key will be inserted into the map with a NULL 'data' pointer. If the key already exists
+	 * then you may not insert it twice, Extensible::Extend will return false in this case.
+	 *
+	 * @return Returns true on success, false if otherwise
+	 */
+	void Extend(const Anope::string &key)
+	{
+		this->Extend(key, new ExtensibleItemPointer<char *>(NULL));
 	}
 
 	/** Shrink an Extensible class.
@@ -73,43 +121,91 @@ class CoreExport Extensible : public Base
 	 */
 	bool Shrink(const Anope::string &key)
 	{
-		extensible_map::iterator it = this->extension_items.find(key);
-		if (it != this->extension_items.end())
+		extensible_map::iterator it = this->Extension_Items.find(key);
+		if (it != this->Extension_Items.end())
 		{
-			if (it->second != NULL)
-				it->second->OnDelete();
+			delete it->second;
 			/* map::size_type map::erase( const key_type& key );
 			 * returns the number of elements removed, std::map
 			 * is single-associative so this should only be 0 or 1
 			 */
-			return this->extension_items.erase(key) > 0;
+			return this->Extension_Items.erase(key);
 		}
 
 		return false;
 	}
 
+	/** Get an extension item that is not a pointer.
+	 *
+	 * @param key The key parameter is an arbitary string which identifies the extension data
+	 * @param p If you provide a non-existent key, this value will be 0. Otherwise a copy to the item you requested will be placed in this templated parameter.
+	 * @return Returns true if the item was found and false if it was nor, regardless of wether 'p' is NULL. This allows you to store NULL values in Extensible.
+	 */
+	template<typename T> bool GetExtRegular(const Anope::string &key, T &p)
+	{
+		extensible_map::iterator it = this->Extension_Items.find(key);
+
+		if (it != this->Extension_Items.end())
+		{
+			p = debug_cast<ExtensibleItemRegular<T> *>(it->second)->GetItem();
+			return true;
+		}
+
+		return false;
+	}
+
+	/** Get an extension item that is a pointer.
+	 *
+	 * @param key The key parameter is an arbitary string which identifies the extension data
+	 * * @param p If you provide a non-existent key, this value will be NULL. Otherwise a pointer to the item you requested will be placed in this templated parameter.
+	 * @return Returns true if the item was found and false if it was nor, regardless of wether 'p' is NULL. This allows you to store NULL values in Extensible.
+	 */
+	template<typename T> bool GetExtPointer(const Anope::string &key, T *&p)
+	{
+		extensible_map::iterator it = this->Extension_Items.find(key);
+
+		if (it != this->Extension_Items.end())
+		{
+			p = debug_cast<ExtensibleItemPointer<T> *>(it->second)->GetItem();
+			return true;
+		}
+
+		p = NULL;
+		return false;
+	}
+
+	/** Get an extension item that is a pointer to an array
+	 *
+	 * @param key The key parameter is an arbitary string which identifies the extension data
+	 * @param p If you provide a non-existent key, this value will be NULL. Otherwise a pointer to the item you requested will be placed in this templated parameter.
+	 * @return Returns true if the item was found and false if it was nor, regardless of wether 'p' is NULL. This allows you to store NULL values in Extensible.
+	 */
+	template<typename T> bool GetExtArray(const Anope::string &key, T *&p)
+	{
+		extensible_map::iterator it = this->Extension_Items.find(key);
+
+		if (it != this->Extension_Items.end())
+		{
+			p = debug_cast<ExtensibleItemPointerArray<T> *>(it->second)->GetItem();
+			return true;
+		}
+
+		p = NULL;
+		return false;
+	}
+
 	/** Get an extension item.
 	 *
 	 * @param key The key parameter is an arbitary string which identifies the extension data
-	 * @return The item found
-	 */
-	template<typename T> T GetExt(const Anope::string &key)
-	{
-		extensible_map::iterator it = this->extension_items.find(key);
-		if (it != this->extension_items.end())
-			return debug_cast<T>(it->second);
-
-		return NULL;
-	}
-
-	/** Check if an extension item exists.
+	 * @return Returns true if the item was found and false if it was not.
 	 *
-	 * @param key The key parameter is an arbitary string which identifies the extension data
-	 * @return True if the item was found.
+	 * This single-parameter version only checks if the key exists, it does nothing with
+	 * the 'data' field and is probably only useful in conjunction with the single-parameter
+	 * version of Extend().
 	 */
-	bool HasExt(const Anope::string &key)
+	bool GetExt(const Anope::string &key)
 	{
-		return this->extension_items.count(key) > 0;
+		return this->Extension_Items.find(key) != this->Extension_Items.end();
 	}
 
 	/** Get a list of all extension items names.
@@ -119,7 +215,7 @@ class CoreExport Extensible : public Base
 	 */
 	void GetExtList(std::deque<Anope::string> &list)
 	{
-		for (extensible_map::iterator it = extension_items.begin(), it_end = extension_items.end(); it != it_end; ++it)
+		for (extensible_map::iterator it = Extension_Items.begin(), it_end = Extension_Items.end(); it != it_end; ++it)
 			list.push_back(it->first);
 	}
 };

include/extern.h

@@ -1,6 +1,6 @@
 /* Prototypes and external variable declarations.
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -17,6 +17,8 @@
 
 #include "hashcomp.h"
 
+E void ModuleRunTimeDirCleanUp();
+
 /* IRC Variables */
 
 E IRCDVar *ircd;
@@ -25,58 +27,109 @@ E IRCdMessage *ircdmessage;
 
 /**** actions.c ****/
 
+E void kill_user(const Anope::string &source, User *user, const Anope::string &reason);
 E bool bad_password(User *u);
 E void common_unban(ChannelInfo *ci, User *u, bool full = false);
 
+E BotInfo *BotServ;
+E BotInfo *ChanServ;
+E BotInfo *Global;
+E BotInfo *HostServ;
+E BotInfo *MemoServ;
+E BotInfo *NickServ;
+E BotInfo *OperServ;
+
 /**** botserv.c ****/
 
+E void get_botserv_stats(long *nrec, long *memuse);
+E void bs_init();
+E void botchanmsgs(User *u, ChannelInfo *ci, const Anope::string &buf);
 E BotInfo *findbot(const Anope::string &nick);
 
+/** Finds a pseudoclient, given a UID. Useful for TS6 protocol modules.
+ * @param uid The UID to search for
+ * @return The pseudoclient structure, or NULL if one could not be found
+ */
+E Anope::string normalizeBuffer(const Anope::string &);
+
+E void check_ban(ChannelInfo *ci, User *u, int ttbtype);
+E void bot_kick(ChannelInfo *ci, User *u, const char *message, ...);
 E void bot_raw_ban(User *requester, ChannelInfo *ci, const Anope::string &nick, const Anope::string &reason);
 E void bot_raw_kick(User *requester, ChannelInfo *ci, const Anope::string &nick, const Anope::string &reason);
 
 /**** channels.c ****/
 
+E void get_channel_stats(long *nrec, long *memuse);
 
 E Channel *findchan(const Anope::string &chan);
 
 E User *nc_on_chan(Channel *c, const NickCore *nc);
 
+E Anope::string get_xop_level(int level);
+
 E void do_cmode(const Anope::string &source, const Anope::string &channel, const Anope::string &modes, const Anope::string &ts);
 E void do_join(const Anope::string &source, const Anope::string &channels, const Anope::string &ts);
 E void do_kick(const Anope::string &source, const Anope::string &channel, const Anope::string &users, const Anope::string &reason);
 E void do_part(const Anope::string &source, const Anope::string &channels, const Anope::string &reason);
+E void MassChannelModes(BotInfo *bi, const Anope::string &modes);
 
 E void chan_set_correct_modes(User *user, Channel *c, int give_modes);
 
+inline BotInfo *whosends(ChannelInfo *ci)
+{
+	if (!ci || !ci->bi || !ci->c || !ci->botflags.HasFlag(BS_SYMBIOSIS) || !ci->c->FindUser(ci->bi))
+		return ChanServ ? ChanServ : NickServ;
+	return ci->bi;
+}
+
 /**** chanserv.c ****/
 
+E LevelInfo levelinfo[];
+
+E void get_chanserv_stats(long *nrec, long *memuse);
+
+E void reset_levels(ChannelInfo *ci);
+E void cs_init();
+E void expire_chans();
+E void cs_remove_nick(NickCore *nc);
+
 E void check_modes(Channel *c);
+E int check_valid_admin(User *user, Channel *chan, int servermode);
+E int check_valid_op(User *user, Channel *chan, int servermode);
 
 E ChannelInfo *cs_findchan(const Anope::string &chan);
+E int check_access(User *user, ChannelInfo *ci, int what);
 E bool IsFounder(User *user, ChannelInfo *ci);
 E void update_cs_lastseen(User *user, ChannelInfo *ci);
 E int get_idealban(ChannelInfo *ci, User *u, Anope::string &ret);
 
+E int levelinfo_maxwidth;
+E Anope::string get_mlock_modes(ChannelInfo *ci, int complete);
+
 /**** config.c ****/
 
 E ConfigurationFile services_conf;
 E ServerConfig *Config;
 
+/* hostserv.c */
+E void do_on_id(User *u);
+E void HostServSyncVhosts(NickAlias *na);
+
 /**** encrypt.c ****/
-E void enc_encrypt(const Anope::string &src, Anope::string &dest);
-E bool enc_decrypt(const Anope::string &src, Anope::string &dest);
+E int enc_encrypt(const Anope::string &src, Anope::string &dest);
+E int enc_decrypt(const Anope::string &src, Anope::string &dest);
 
 /**** hostserv.c  ****/
+E void get_hostserv_stats(long *nrec, long *memuse);
+E void hostserv_init();
 
 /**** init.c ****/
 
 E void introduce_user(const Anope::string &user);
 E bool GetCommandLineArgument(const Anope::string &name, char shortname = 0);
 E bool GetCommandLineArgument(const Anope::string &name, char shortname, Anope::string &param);
-E bool AtTerm();
-E void Fork();
 E void Init(int ac, char **av);
+E Uplink *uplink_server;
 
 /**** ircd.c ****/
 E void pmodule_ircd_proto(IRCDProto *);
@@ -85,12 +138,16 @@ E void pmodule_ircd_message(IRCdMessage *message);
 
 /**** language.cpp ****/
 E std::vector<Anope::string> languages;
-E std::vector<Anope::string> domains;
 E void InitLanguages();
-E const char *translate(const char *string);
-E const char *translate(User *u, const char *string);
-E const char *translate(NickCore *nc, const char *string);
-E const char *anope_gettext(const char *lang, const char *string);
+E const Anope::string GetString(NickCore *nc, const char *string);
+E const Anope::string GetString(const Anope::string &domain, const Anope::string &lang, const char *string);
+E void PushLanguage(const Anope::string &, Anope::string);
+E void PopLanguage();
+E const char *anope_gettext(const char *string);
+E void SyntaxError(CommandSource &source, const Anope::string &command, const Anope::string &message);
+
+/*** logger.cpp ***/
+E void InitLogChannels(ServerConfig *);
 
 /**** main.c ****/
 
@@ -104,40 +161,36 @@ E bool noexpire;
 E bool protocoldebug;
 
 E bool quitting;
-E int return_code;
-E bool restarting;
+E bool shutting_down;
 E Anope::string quitmsg;
+E bool save_data;
 E time_t start_time;
 
-class UplinkSocket : public ConnectionSocket, public BufferedSocket
-{
- public:
-	UplinkSocket();
-	~UplinkSocket();
-	bool Read(const Anope::string &);
-	void OnConnect();
-	void OnError(const Anope::string &);
-	
-	class CoreExport Message
-	{
-		Anope::string source;
-		std::stringstream buffer;
-	 public:
-	 	Message();
-	 	Message(const Anope::string &);
-	 	~Message();
-		template<typename T> Message &operator<<(const T &val)
-		{
-			this->buffer << val;
-			return *this;
-		}
-	};
-};
-E UplinkSocket *UplinkSock;
-E int CurrentUplink;
+E ConnectionSocket *UplinkSock;
 
 E void save_databases();
+E void expire_all();
 E void sighandler(int signum);
+E void do_restart_services();
+
+/* The socket to our uplink */
+class CoreExport UplinkSocket : public ConnectionSocket
+{
+ public:
+	UplinkSocket(bool ipv6 = false);
+
+	virtual ~UplinkSocket();
+
+	bool Read(const Anope::string &buf);
+};
+
+/**** memoserv.c ****/
+
+E void ms_init();
+E void rsend_notify(CommandSource &source, Memo *m, const Anope::string &chan);
+E void check_memos(User *u);
+E MemoInfo *getmemoinfo(const Anope::string &name, bool &ischan, bool &isforbid);
+E void memo_send(CommandSource &source, const Anope::string &name, const Anope::string &text, int z);
 
 /**** messages.cpp ****/
 
@@ -170,31 +223,43 @@ E bool OnError(const Anope::string &, const std::vector<Anope::string> &);
 /**** misc.c ****/
 
 E bool IsFile(const Anope::string &filename);
+E int toupper(char);
+E int tolower(char);
+#ifndef HAVE_STRLCPY
+E size_t strlcpy(char *, const char *, size_t);
+#endif
+#ifndef HAVE_STRLCAT
+E size_t strlcat(char *, const char *, size_t);
+#endif
 
 E time_t dotime(const Anope::string &s);
-E Anope::string duration(const time_t &seconds, NickCore *nc = NULL);
+E Anope::string duration(time_t seconds);
 E Anope::string expire_left(NickCore *nc, time_t expires);
-E Anope::string do_strftime(const time_t &t, NickCore *nc = NULL, bool short_output = false);
-E bool IsValidIdent(const Anope::string &ident);
-E bool IsValidHost(const Anope::string &host);
+E Anope::string do_strftime(const time_t &t);
+E bool doValidHost(const Anope::string &host, int type);
+
+E bool isValidHost(const Anope::string &host, int type);
+E bool isvalidchar(char c);
 
 E Anope::string myStrGetToken(const Anope::string &str, char dilim, int token_number);
 E Anope::string myStrGetTokenRemainder(const Anope::string &str, char dilim, int token_number);
 E int myNumToken(const Anope::string &str, char dilim);
+E void EnforceQlinedNick(const Anope::string &nick, const Anope::string &killer);
 E bool nickIsServices(const Anope::string &nick, bool bot);
 
 E void add_entropy_userkeys();
 E void rand_init();
 E unsigned char getrandom8();
-E uint16_t getrandom16();
-E uint32_t getrandom32();
+E uint16 getrandom16();
+E uint32 getrandom32();
+
+E char *str_signed(unsigned char *str);
 
 E std::list<Anope::string> BuildStringList(const Anope::string &, char = ' ');
 E std::vector<Anope::string> BuildStringVector(const Anope::string &, char = ' ');
 
 E bool str_is_wildcard(const Anope::string &str);
 E bool str_is_pure_wildcard(const Anope::string &str);
-E Anope::string normalizeBuffer(const Anope::string &);
 
 /**** modes.cpp ****/
 /* Number of generic modes we support */
@@ -204,9 +269,15 @@ E void SetDefaultMLock(ServerConfig *config);
 
 /**** nickserv.c ****/
 
+E void get_aliases_stats(long &count, long &mem);
+E void get_core_stats(long &count, long &mem);
 E void change_core_display(NickCore *nc);
 E void change_core_display(NickCore *nc, const Anope::string &newdisplay);
+E int do_setmodes(User *u);
 
+E void ns_init();
+E int validate_user(User *u);
+E void expire_nicks();
 E NickAlias *findnick(const Anope::string &nick);
 E NickCore *findcore(const Anope::string &nick);
 E bool is_on_access(const User *u, const NickCore *nc);
@@ -215,18 +286,45 @@ E bool is_on_access(const User *u, const NickCore *nc);
 
 E void process(const Anope::string &buf);
 
+/**** send.c ****/
+
+E void send_cmd(const Anope::string &source, const char *fmt, ...) FORMAT(printf, 2, 3);
+
+E void notice_server(const Anope::string &source, const Server *s, const char *fmt, ...) FORMAT(printf, 3, 4);
+
+/**** sessions.c ****/
+
+E std::vector<Exception *> exceptions;
+
+E void get_session_stats(long &count, long &mem);
+E void get_exception_stats(long &count, long &mem);
+
+E void add_session(User *u);
+E void del_session(User *u);
+
+E void expire_exceptions();
+
+E Session *findsession(const Anope::string &host);
+
+E Exception *find_host_exception(const Anope::string &host);
+E Exception *find_hostip_exception(const Anope::string &host, const Anope::string &hostip);
+E int exception_add(User *u, const Anope::string &mask, unsigned limit, const Anope::string &reason, const Anope::string &who, time_t expires);
+
 /**** sockets.cpp ****/
 
-E int32_t TotalRead;
-E int32_t TotalWritten;
+E SocketEngineBase *SocketEngine;
+E int32 TotalRead;
+E int32 TotalWritten;
 E SocketIO normalSocketIO;
 
 /**** users.c ****/
 
-E int32_t opcnt;
-E uint32_t maxusercnt, usercnt;
+E int32 opcnt;
+E uint32 maxusercnt, usercnt;
 E time_t maxusertime;
 
+E void get_user_stats(long &count, long &mem);
+
 E User *finduser(const Anope::string &nick);
 
 E User *do_nick(const Anope::string &source, const Anope::string &nick, const Anope::string &username, const Anope::string &host, const Anope::string &server, const Anope::string &realname, time_t ts, const Anope::string &ip, const Anope::string &vhost, const Anope::string &uid, const Anope::string &modes);
@@ -235,7 +333,18 @@ E void do_umode(const Anope::string &user, const Anope::string &modes);
 E void do_kill(User *user, const Anope::string &reason);
 
 E bool matches_list(Channel *c, User *user, ChannelModeName mode);
+E bool is_excepted_mask(ChannelInfo *ci, const Anope::string &mask);
 
 E Anope::string create_mask(User *u);
 
+/******************************************************************************/
+
+E void b64_encode(const Anope::string &src, Anope::string &target);
+E void b64_decode(const Anope::string &src, Anope::string &target);
+
+#ifdef _WIN32
+E Anope::string GetWindowsVersion();
+E bool SupportedWindowsVersion();
+#endif
+
 #endif /* EXTERN_H */

include/hashcomp.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002-2011 InspIRCd Development Team
- * Copyright (C) 2009-2012 Anope Team <team@anope.org>
+ * Copyright (C) 2009-2011 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  *
@@ -33,6 +33,34 @@ namespace Anope
 	class string;
 }
 
+#ifndef _WIN32
+# if defined(__GNUC__) && __GNUC__ >= 4
+/* GCC4+ has deprecated hash_map and uses tr1. But of course, uses a different include to MSVC. */
+#  include <tr1/unordered_map>
+#  define unordered_map_namespace std::tr1
+# else /* GCC ver < 4 */
+#  include <ext/hash_map>
+/* Oddball linux namespace for hash_map */
+#  define unordered_map_namespace __gnu_cxx
+#  define unordered_map hash_map
+# endif
+#else
+# if _MSC_VER >= 1600
+/* MSVC 2010+ has tr1. Though MSVC and GCC use different includes! */
+#  include <unordered_map>
+#  define unordered_map_namespace std::tr1
+# else
+#  include <hash_map>
+#  define unordered_map_namespace
+template<typename Key, typename Type, typename Compare, typename Unused = void>
+class unordered_map : public stdext::hash_map<Key, Type, Compare>
+{
+ public:
+	unordered_map() : hash_map() { }
+};
+# endif
+#endif
+
 /*******************************************************
  * This file contains classes and templates that deal
  * with the comparison and hashing of 'irc strings'.
@@ -140,14 +168,21 @@ namespace irc
 	 */
 	typedef std::basic_string<char, irc_char_traits, std::allocator<char> > string;
 
-	struct CoreExport less
+	/** Used to hash irc::strings for unordered_map
+	 */
+	struct CoreExport hash
 	{
-		/** Compare two Anope::strings as irc::strings and find which one is less
-		 * @param s1 The first string
-		 * @param s2 The second string
-		 * @return true if s1 < s2, else false
-		 */
+		/* VS 2008 specific code */
+		enum { bucket_size = 4, min_buckets = 8 };
 		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+		/* End VS 2008 specific code */
+
+		/** Hash an irc::string for unordered_map
+		 * @param s The string
+		 * @return A hash value for the string
+		 */
+		size_t operator()(const irc::string &s) const;
+		size_t operator()(const Anope::string &s) const;
 	};
 }
 
@@ -204,8 +239,60 @@ namespace ci
 	 */
 	typedef std::basic_string<char, ci_char_traits, std::allocator<char> > string;
 
-	struct CoreExport less
+	/** Used to hash ci::strings for unordered_map
+	 */
+	struct CoreExport hash
 	{
+		/* VS 2008 specific code */
+		enum { bucket_size = 4, min_buckets = 8 };
+		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+		/* End VS 2008 specific code */
+
+		/** Hash a ci::string for unordered_map
+		 * @param s The string
+		 * @return A hash value for the string
+		 */
+		size_t operator()(const ci::string &s) const;
+		size_t operator()(const Anope::string &s) const;
+	};
+}
+
+namespace std
+{
+	/** An overload for std::equal_to<ci::string> that uses Anope::string, passed for the fourth temmplate
+	 * argument for unordered_map
+	 */
+	template<> struct CoreExport equal_to<ci::string>
+	{
+	 public:
+		/** Compare two Anope::strings as ci::strings
+		 * @paarm s1 The first string
+		 * @param s2 The second string
+		 * @return true if they are equal
+		 */
+		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+	};
+
+	/** An overload for std::equal_to<irc::string> that uses Anope::string, passed for the fourth template
+	 * argument for unorderd_map
+	 */
+	template<> struct CoreExport equal_to<irc::string>
+	{
+	 public:
+		/** Compare two Anope::strings as irc::strings
+		 * @param s1 The first string
+		 * @param s2 The second string
+		 * @return true if they are equal
+		 */
+		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+	};
+
+	/** An overload for std::less<ci::string> that uses Anope::string, passed for the third template argument
+	 * to std::map and std::multimap
+	 */
+	template<> struct CoreExport less<ci::string>
+	{
+	 public:
 		/** Compare two Anope::strings as ci::strings and find which one is less
 		 * @param s1 The first string
 		 * @param s2 The second string
@@ -213,6 +300,44 @@ namespace ci
 		 */
 		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
 	};
+
+	/** An overload for std;:less<irc::string> that uses Anope::string, passed for the third tempalte argument
+	 * to std::map and std::multimap
+	 */
+	template<> struct CoreExport less<irc::string>
+	{
+	 public:
+		/** Compare two Anope::strings as irc::strings and find which one is less
+		 * @param s1 The first string
+		 * @param s2 The second string
+		 * @return true if s1 < s2, else false
+		 */
+		bool operator()(const Anope::string &s1, const Anope::string &s2) const;
+	};
+}
+
+/* Define operators for using >> and << with irc::string to an ostream on an istream. */
+/* This was endless fun. No. Really. */
+/* It was also the first core change Ommeh made, if anyone cares */
+
+/** Operator >> for irc::string
+ */
+inline std::istream &operator>>(std::istream &is, irc::string &str)
+{
+	std::string tmp;
+	is >> tmp;
+	str = tmp.c_str();
+	return is;
+}
+
+/** Operator >> for ci::string
+ */
+inline std::istream &operator>>(std::istream &is, ci::string &str)
+{
+	std::string tmp;
+	is >> tmp;
+	str = tmp.c_str();
+	return is;
 }
 
 /* Define operators for + and == with irc::string to std::string for easy assignment

include/language.h

@@ -1,85 +1,115 @@
 /* Commonly used language strings
  *
- * (C) 2008-2012 Anope Team
+ * (C) 2008-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
 
-#define MORE_INFO			_("\002%s%s HELP %s\002 for more information.")
-#define BAD_USERHOST_MASK		_("Mask must be in the form \037user\037@\037host\037.")
-#define BAD_EXPIRY_TIME			_("Invalid expiry time.")
-#define USERHOST_MASK_TOO_WIDE		_("%s coverage is too wide; Please use a more specific mask.")
-#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. Please try again with a shorter password.")
-#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.")
-#define NICK_X_NOT_ON_CHAN		_("\002%s\002 is not currently on channel %s.")
-#define NICK_X_SUSPENDED		_("Nick %s is currently suspended.")
-#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 MAIL_X_INVALID			_("\002%s\002 is not a valid e-mail address.")
-#define NO_REASON			_("No reason")
-#define UNKNOWN				_("<unknown>")
-#define NO_EXPIRE			_("does not expire")
-#define LIST_INCORRECT_RANGE		_("Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002.")
-#define UNKNOWN_OPTION			_("Unknown option \002%s\002.\n" \
-						"Type %s%s HELP %s for more information.")
-#define NICK_IS_REGISTERED		_("This nick is owned by someone else.  Please choose another.\n" \
-						"(If this is your nick, type \002%s%s IDENTIFY \037password\037\002.)")
-#define NICK_IS_SECURE			_("This nickname is registered and protected.  If it is your\n" \
+#define MORE_INFO			"\002%s%s HELP %s\002 for more information."
+#define BAD_USERHOST_MASK		"Mask must be in the form \037user\037@\037host\037."
+#define BAD_EXPIRY_TIME			"Invalid expiry time."
+#define USERHOST_MASK_TOO_WIDE		"%s coverage is too wide; Please use a more specific mask."
+#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 five characters long, should not be something easily guessed (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. Please try again with a shorter password."
+#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."
+#define NICK_X_NOT_ON_CHAN		"\002%s\002 is not currently on channel %s."
+#define NICK_X_FORBIDDEN		"Nick \002%s\002 may not be registered or used."
+#define NICK_X_FORBIDDEN_OPER		"Nick \002%s\002 has been forbidden by %s:\n" \
+						"%s"
+#define NICK_X_SUSPENDED			"Nick %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 CHAN_X_FORBIDDEN		"Channel \002%s\002 may not be registered or used."
+#define CHAN_X_FORBIDDEN_OPER		"Channel \002%s\002 has been forbidden by %s:\n" \
+						"%s"
+#define NICK_IDENTIFY_REQUIRED		"Password authentication required for that command.\n" \
+						"Retry after typing \002%s%s IDENTIFY \037password\037\002."
+#define MAIL_X_INVALID			"\002%s\002 is not a valid e-mail address."
+#define NO_REASON			"No reason"
+#define UNKNOWN				"<unknown>"
+#define NO_EXPIRE			"does not expire"
+#define END_OF_ANY_LIST			"End of \002%s\002 list."
+#define LIST_INCORRECT_RANGE		"Incorrect range specified. The correct syntax is \002#\037from\037-\037to\037\002."
+#define UNKNOWN_OPTION			"Unknown option \002%s\002.\n" \
+						"Type %s%s HELP %s for more information."
+#define NICK_IS_REGISTERED		"This nick is owned by someone else.  Please choose another.\n" \
+						"(If this is your nick, type \002%s%s IDENTIFY \037password\037\002.)"
+#define NICK_IS_SECURE			"This nickname is registered and protected.  If it is your\n" \
 						"nick, type \002%s%s IDENTIFY \037password\037\002.  Otherwise,\n" \
-						"please choose a different nick.")
-#define FORCENICKCHANGE_NOW		_("This nickname has been registered; you may not use it.")
-#define NICK_CANNOT_BE_REGISTERED	_("Nickname \002%s\002 may not be registered.")
-#define NICK_ALREADY_REGISTERED		_("Nickname \002%s\002 is already registered!")
-#define NICK_SET_SYNTAX			_("SET \037option\037 \037parameters\037")
-#define NICK_SET_DISABLED		_("Sorry, nickname option setting is temporarily disabled.")
-#define NICK_SET_UNKNOWN_OPTION		_("Unknown SET option \002%s%s\002.")
-#define NICK_SET_DISPLAY_CHANGED	_("The new display is now \002%s\002.")
-#define NICK_LIST_SYNTAX		_("LIST \037pattern\037")
-#define NICK_RECOVERED			_("User claiming your nick has been killed.\n" \
-						"\002%s%s RELEASE %s\002 to get it back before %s timeout.")
-#define NICK_REQUESTED			_("This nick has already been requested, please check your e-mail address for the pass code")
-#define NICK_CONFIRM_INVALID		_("Invalid passcode has been entered, please check the e-mail again, and retry")
-#define CHAN_NOT_ALLOWED_TO_JOIN	_("You are not permitted to be on this channel.")
-#define CHAN_X_INVALID			_("Channel %s is not a valid channel.")
-#define CHAN_REACHED_CHANNEL_LIMIT	_("Sorry, you have already reached your limit of \002%d\002 channels.")
-#define CHAN_EXCEEDED_CHANNEL_LIMIT	_("Sorry, you have already exceeded your limit of \002%d\002 channels.")
-#define CHAN_SYMBOL_REQUIRED		_("Please use the symbol of \002#\002 when attempting to register")
-#define CHAN_SET_DISABLED		_("Sorry, channel option setting is temporarily disabled.")
-#define CHAN_SETTING_CHANGED		_("%s for %s set to %s.")
-#define CHAN_SETTING_UNSET		_("%s for %s unset.")
-#define CHAN_SET_MLOCK_DEPRECATED	_("MLOCK is deprecated. Use \002%s%s HELP MODE\002 instead.")
-#define CHAN_ACCESS_LEVEL_RANGE		_("Access level must be between %d and %d inclusive.")
-#define CHAN_INFO_HEADER		_("Information for channel \002%s\002:")
-#define CHAN_EXCEPTED			_("\002%s\002 matches an except on %s and cannot be banned until the except have been removed.")
-#define MEMO_NEW_X_MEMO_ARRIVED		_("There is a new memo on channel %s.\n" \
-						"Type \002%s%s READ %s %d\002 to read it.")
-#define MEMO_NEW_MEMO_ARRIVED		_("You have a new memo from %s.\n" \
-						"Type \002%s%s READ %d\002 to read it.")
-#define MEMO_HAVE_NO_MEMOS		_("You have no memos.")
-#define MEMO_X_HAS_NO_MEMOS		_("%s has no memos.")
-#define MEMO_SEND_SYNTAX		_("SEND {\037nick\037 | \037channel\037} \037memo-text\037")
-#define MEMO_SEND_DISABLED		_("Sorry, memo sending is temporarily disabled.")
-#define MEMO_HAVE_NO_NEW_MEMOS		_("You have no new memos.")
-#define MEMO_X_HAS_NO_NEW_MEMOS		_("%s has no new memos.")
-#define BOT_DOES_NOT_EXIST		_("Bot \002%s\002 does not exist.")
-#define BOT_NOT_ASSIGNED		_("You must assign a bot to the channel before using this command.")
-#define BOT_NOT_ON_CHANNEL		_("Bot is not on channel \002%s\002.")
-#define BOT_ASSIGN_READONLY		_("Sorry, bot assignment is temporarily disabled.")
-#define HOST_SET_ERROR			_("A vhost must be in the format of a valid hostmask.")
-#define HOST_SET_IDENT_ERROR		_("A vhost ident must be in the format of a valid ident")
-#define HOST_SET_TOOLONG		_("Error! The vhost is too long, please use a host shorter than %d characters.")
-#define HOST_SET_IDENTTOOLONG		_("Error! The 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")
+						"please choose a different nick."
+#define FORCENICKCHANGE_NOW		"This nickname has been registered; you may not use it."
+#define NICK_CANNOT_BE_REGISTERED	"Nickname \002%s\002 may not be registered."
+#define NICK_ALREADY_REGISTERED		"Nickname \002%s\002 is already registered!"
+#define NICK_SET_SYNTAX			"SET \037option\037 \037parameters\037"
+#define NICK_SET_DISABLED		"Sorry, nickname option setting is temporarily disabled."
+#define NICK_SET_UNKNOWN_OPTION		"Unknown SET option \002%s%s\002."
+#define NICK_SET_DISPLAY_CHANGED	"The new display is now \002%s\002."
+#define NICK_SASET_SYNTAX		"SASET \037nickname\037 \037option\037 \037parameters\037"
+#define NICK_SASET_DISPLAY_INVALID	"The new display for \002%s\002 MUST be a nickname of the nickname group!"
+#define NICK_SASET_PASSWORD_FAILED	"Sorry, couldn't change password for \002%s\002."
+#define NICK_SASET_PASSWORD_CHANGED	"Password for \002%s\002 changed."
+#define NICK_SASET_PASSWORD_CHANGED_TO	"Password for \002%s\002 changed to \002%s\002."
+#define NICK_INFO_OPTIONS		"          Options: %s"
+#define NICK_LIST_SYNTAX		"LIST \037pattern\037"
+#define LIST_HEADER			"List of entries matching \002%s\002:"
+#define NICK_RECOVERED			"User claiming your nick has been killed.\n" \
+						"\002%s%s RELEASE %s\002 to get it back before %s timeout."
+#define NICK_REQUESTED			"This nick has already been requested, please check your e-mail address for the pass code"
+#define NICK_CONFIRM_INVALID		"Invalid passcode has been entered, please check the e-mail again, and retry"
+#define CHAN_NOT_ALLOWED_TO_JOIN	"You are not permitted to be on this channel."
+#define CHAN_X_INVALID			"Channel %s is not a valid channel."
+#define CHAN_REACHED_CHANNEL_LIMIT	"Sorry, you have already reached your limit of \002%d\002 channels."
+#define CHAN_EXCEEDED_CHANNEL_LIMIT	"Sorry, you have already exceeded your limit of \002%d\002 channels."
+#define CHAN_SYMBOL_REQUIRED		"Please use the symbol of \002#\002 when attempting to register"
+#define CHAN_SASET_SYNTAX		"SASET \002channel\002 \037option\037 \037parameters\037"
+#define CHAN_SET_SYNTAX			"SET \037channel\037 \037option\037 \037parameters\037"
+#define CHAN_SET_DISABLED		"Sorry, channel option setting is temporarily disabled."
+#define CHAN_SETTING_CHANGED		"%s for %s set to %s."
+#define CHAN_SETTING_UNSET		"%s for %s unset."
+#define CHAN_SET_MLOCK_DEPRECATED	"MLOCK is deprecated. Use \002%s%s HELP MODE\002 instead."
+#define CHAN_ACCESS_LEVEL_RANGE		"Access level must be between %d and %d inclusive."
+#define CHAN_ACCESS_LIST_HEADER		"Access list for %s:\n" \
+						"  Num   Lev  Mask"
+#define CHAN_ACCESS_VIEW_XOP_FORMAT	"  %3d   %s   %s\n" \
+						"    by %s, last seen %s"
+#define CHAN_ACCESS_VIEW_AXS_FORMAT	"  %3d  %4d  %s\n" \
+						"    by %s, last seen %s"
+#define CHAN_AKICK_VIEW_FORMAT		"%3d %s (by %s on %s)\n" \
+						"    %s"
+#define CHAN_INFO_HEADER		"Information for channel \002%s\002:"
+#define CHAN_EXCEPTED			"\002%s\002 matches an except on %s and cannot be banned until the except have been removed."
+#define CHAN_LIST_ENTRY			"%3d    %s\n" \
+						"  Added by %s on %s"
+#define MEMO_NEW_X_MEMO_ARRIVED		"There is a new memo on channel %s.\n" \
+						"Type \002%s%s READ %s %d\002 to read it."
+#define MEMO_NEW_MEMO_ARRIVED		"You have a new memo from %s.\n" \
+						"Type \002%s%s READ %d\002 to read it."
+#define MEMO_HAVE_NO_MEMOS		"You have no memos."
+#define MEMO_X_HAS_NO_MEMOS		"%s has no memos."
+#define MEMO_SEND_SYNTAX		"SEND {\037nick\037 | \037channel\037} \037memo-text\037"
+#define MEMO_SEND_DISABLED		"Sorry, memo sending is temporarily disabled."
+#define MEMO_HAVE_NO_NEW_MEMOS		"You have no new memos."
+#define MEMO_X_HAS_NO_NEW_MEMOS		"%s has no new memos."
+#define BOT_DOES_NOT_EXIST		"Bot \002%s\002 does not exist."
+#define BOT_NOT_ASSIGNED		"You must assign a bot to the channel before using this command.\n" \
+						"Type %s%s HELP ASSIGN for more information."
+#define BOT_NOT_ON_CHANNEL		"Bot is not on channel \002%s\002."
+#define BOT_ASSIGN_READONLY		"Sorry, bot assignment is temporarily disabled."
+#define ENABLED				"Enabled"
+#define DISABLED			"Disabled"
+#define OPER_LIST_FORMAT		"  %3d   %-32s  %s"
+#define OPER_VIEW_FORMAT		"%3d  %s (by %s on %s; %s)\n" \
+						"      %s"
+#define HOST_SET_ERROR			"A vhost must be in the format of a valid hostmask."
+#define HOST_SET_IDENT_ERROR		"A vhost ident must be in the format of a valid ident"
+#define HOST_SET_TOOLONG		"Error! The vhost is too long, please use a host shorter than %d characters."
+#define HOST_SET_IDENTTOOLONG		"Error! The 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/logger.h

@@ -29,24 +29,17 @@ struct LogFile
 	Anope::string GetName() const;
 };
 
-class Command;
-
 class CoreExport Log
 {
  public:
 	BotInfo *bi;
-	User *u;
-	Command *c;
-	Channel *chan;
-	ChannelInfo *ci;
-	Server *s;
 	LogType Type;
 	Anope::string Category;
 	std::list<Anope::string> Sources;
 
 	std::stringstream buf;
 
-	Log(LogType type = LOG_NORMAL, const Anope::string &category = "", BotInfo *bi = NULL);
+	Log(LogType type = LOG_NORMAL, const Anope::string &category = "", BotInfo *bi = Global);
 
 	/* LOG_COMMAND/OVERRIDE/ADMIN */
 	Log(LogType type, User *u, Command *c, ChannelInfo *ci = NULL);
@@ -64,8 +57,6 @@ class CoreExport Log
 
 	~Log();
 
-	Anope::string BuildPrefix() const;
-
 	template<typename T> Log &operator<<(T val)
 	{
 		this->buf << val;
@@ -80,6 +71,7 @@ class CoreExport LogInfo
 	std::map<Anope::string, LogFile *> Logfiles;
 	std::list<Anope::string> Sources;
 	int LogAge;
+	bool Inhabit;
 	std::list<Anope::string> Admin;
 	std::list<Anope::string> Override;
 	std::list<Anope::string> Commands;
@@ -90,13 +82,17 @@ class CoreExport LogInfo
 	bool RawIO;
 	bool Debug;
 
-	LogInfo(int logage, bool rawio, bool debug);
+	LogInfo(int logage, bool inhabit, bool rawio, bool debug);
 
 	~LogInfo();
 
 	void AddType(std::list<Anope::string> &list, const Anope::string &type);
 
-	bool HasType(LogType ltype, const Anope::string &type) const;
+	bool HasType(std::list<Anope::string> &list, const Anope::string &type) const;
+
+	std::list<Anope::string> &GetList(LogType type);
+
+	bool HasType(LogType Type);
 
 	void ProcessMessage(const Log *l);
 };

include/modes.h

@@ -1,7 +1,7 @@
 /* Mode support
  *
  * Copyright (C) 2008-2011 Adam <Adam@anope.org>
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2011 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -19,7 +19,7 @@ enum UserModeName
 	UMODE_REGPRIV, UMODE_PROTECTED, UMODE_NO_CTCP, UMODE_WEBTV, UMODE_WEBIRC, UMODE_WHOIS, UMODE_ADMIN, UMODE_DEAF,
 	UMODE_GLOBOPS, UMODE_HELPOP, UMODE_INVIS, UMODE_OPER, UMODE_PRIV, UMODE_GOD, UMODE_REGISTERED,
 	UMODE_SNOMASK, UMODE_VHOST, UMODE_WALLOPS, UMODE_CLOAK, UMODE_SSL, UMODE_SOFTCALLERID, UMODE_CALLERID,
-	UMODE_COMMONCHANS, UMODE_HIDDEN, UMODE_STRIPCOLOR, UMODE_INVISIBLE_OPER, UMODE_RESTRICTED, UMODE_HIDEIDLE,
+	UMODE_COMMONCHANS, UMODE_HIDDEN, UMODE_STRIPCOLOR, UMODE_INVISIBLE_OPER, UMODE_RESTRICTED,
 
 	UMODE_END
 };
@@ -31,7 +31,7 @@ const Anope::string UserModeNameStrings[] = {
 	"UMODE_REGPRIV", "UMODE_PROTECTED", "UMODE_NO_CTCP", "UMODE_WEBTV", "UMODE_WEBIRC", "UMODE_WHOIS", "UMODE_ADMIN", "UMODE_DEAF",
 	"UMODE_GLOBOPS", "UMODE_HELPOP", "UMODE_INVIS", "UMODE_OPER", "UMODE_PRIV", "UMODE_GOD", "UMODE_REGISTERED",
 	"UMODE_SNOMASK", "UMODE_VHOST", "UMODE_WALLOPS", "UMODE_CLOAK", "UMODE_SSL", "UMODE_SOFTCALLERID", "UMODE_CALLERID",
-	"UMODE_COMMONCHANS", "UMODE_HIDDEN", "UMODE_STRIPCOLOR", "UMODE_INVISIBLE_OPER", "UMODE_RESTRICTED", "UMODE_HIDEIDLE",
+	"UMODE_COMMONCHANS", "UMODE_HIDDEN", "UMODE_STRIPCOLOR", "UMODE_INVISIBLE_OPER", "UMODE_RESTRICTED"
 
 	""
 };
@@ -193,7 +193,7 @@ class CoreExport ChannelMode : public Mode
 	 * NOTE: User CAN be NULL, this is for checking if it can be locked with defcon
 	 * @param u The user, or NULL
 	 */
-	virtual bool CanSet(User *u) const;
+	bool CanSet(User *u) const;
 
 	/** Returns the mode name as a string
 	 */
@@ -276,24 +276,29 @@ class CoreExport ChannelModeStatus : public ChannelMode
  public:
 	/* The symbol, eg @ % + */
 	char Symbol;
-	/* The "level" of the mode, used to compare with other modes.
-	 * Used so we know op > halfop > voice etc.
-	 */
-	unsigned short Level;
 
 	/** Default constructor
 	 * @param mName The mode name
 	 * @param modeChar The mode char
-	 * @param mSymbol The symbol for the mode, eg @ % 
-	 * @param mLevel A level for the mode, which is usually determined by the PREFIX capab
+	 * @param mSymbol The symbol for the mode, eg @ % +
 	 */
-	ChannelModeStatus(ChannelModeName mName, char modeChar, char mSymbol, unsigned short mLevel = 0);
+	ChannelModeStatus(ChannelModeName mName, char modeChar, char mSymbol);
 
 	/** Default destructor
 	 */
 	virtual ~ChannelModeStatus();
 };
 
+/** Channel mode +b
+ */
+class CoreExport ChannelModeBan : public ChannelModeList
+{
+ public:
+	ChannelModeBan(ChannelModeName mName, char modeChar) : ChannelModeList(mName, modeChar) { }
+
+	void OnAdd(Channel *chan, const Anope::string &mask);
+};
+
 /** Channel mode +k (key)
  */
 class CoreExport ChannelModeKey : public ChannelModeParam
@@ -375,16 +380,6 @@ class StackerInfo
 class CoreExport ModeManager
 {
  protected:
-	class ModePipe : public Pipe
-	{
-	 public:
-	 	/** Called when there are modes to be set
-		 */
-		void OnNotify();
-	};
-
-	static ModePipe *mpipe;
-
 	/* List of pairs of user/channels and their stacker info */
 	static std::list<std::pair<Base *, StackerInfo *> > StackerObjects;
 

include/module.h

@@ -2,8 +2,7 @@
 #define MODULE_H
 
 #include "services.h"
-#include "modules.h"
-#include "oper.h"
 #include "commands.h"
+#include "modules.h"
 
 #endif // MODULE_H

include/modules.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -17,6 +17,28 @@
 #include <stdio.h>
 #include "timers.h"
 #include "hashcomp.h"
+#include "commands.h"
+
+/* Cross OS compatibility macros */
+#ifdef _WIN32
+	typedef HMODULE ano_module_t;
+
+# define dlopen(file, unused) LoadLibrary(file)
+# define dlsym(file, symbol) (HMODULE)GetProcAddress(file, symbol)
+# define dlclose(file) FreeLibrary(file) ? 0 : 1
+# define ano_modclearerr() SetLastError(0)
+# define ano_moderr() Anope::LastError().c_str()
+#else
+	typedef void * ano_module_t;
+
+/* We call dlerror() here because it clears the module error after being
+ * called. This previously read 'errno = 0', but that didn't work on
+ * all POSIX-compliant architectures. This way the error is guaranteed
+ * to be cleared, POSIX-wise. -GD
+ */
+# define ano_modclearerr() dlerror()
+# define ano_moderr() dlerror()
+#endif
 
 /** Possible return types from events.
  */
@@ -105,6 +127,10 @@ else \
 
 class Message;
 
+extern CoreExport Module *FindModule(const Anope::string &name);
+int protocol_module_init();
+extern CoreExport bool moduleMinVersion(int major, int minor, int patch, int build);
+
 enum ModuleReturn
 {
 	MOD_ERR_OK,
@@ -112,9 +138,15 @@ enum ModuleReturn
 	MOD_ERR_PARAMS,
 	MOD_ERR_EXISTS,
 	MOD_ERR_NOEXIST,
+	MOD_ERR_NOUSER,
 	MOD_ERR_NOLOAD,
+	MOD_ERR_NOUNLOAD,
+	MOD_ERR_SYNTAX,
+	MOD_ERR_NODELETE,
 	MOD_ERR_UNKNOWN,
 	MOD_ERR_FILE_IO,
+	MOD_ERR_NOSERVICE,
+	MOD_ERR_NO_MOD_NAME,
 	MOD_ERR_EXCEPTION,
 	MOD_ERR_VERSION
 };
@@ -123,7 +155,7 @@ enum ModuleReturn
  */
 enum Priority { PRIORITY_FIRST, PRIORITY_DONTCARE, PRIORITY_LAST, PRIORITY_BEFORE, PRIORITY_AFTER };
 /* Module types, in the order in which they are unloaded. The order these are in is IMPORTANT */
-enum ModType { MT_BEGIN, THIRD, SUPPORTED, CORE, DATABASE, ENCRYPTION, PROTOCOL, MT_END };
+enum MODType { MT_BEGIN, THIRD, QATESTED, SUPPORTED, CORE, DATABASE, ENCRYPTION, PROTOCOL, SOCKETENGINE, MT_END };
 
 typedef std::multimap<Anope::string, Message *> message_map;
 extern CoreExport message_map MessageMap;
@@ -165,9 +197,8 @@ class Version
 	int GetBuild() const;
 };
 
+/* Forward declaration of CallBack class for the Module class */
 class CallBack;
-class XLineManager;
-struct CommandSource;
 
 /** Every module in Anope is actually a class.
  */
@@ -180,10 +211,6 @@ class CoreExport Module : public Extensible
 	 */
 	Anope::string name;
 
-	/** What type this module is
-	 */
-	ModType type;
-
 	/** The temporary path/filename
 	 */
 	Anope::string filename;
@@ -194,7 +221,7 @@ class CoreExport Module : public Extensible
 
 	/** Handle for this module, obtained from dlopen()
 	 */
-	void *handle;
+	ano_module_t handle;
 
 	/** Time this module was created
 	 */
@@ -208,17 +235,24 @@ class CoreExport Module : public Extensible
 	 */
 	Anope::string author;
 
-	/** Creates and initialises a new module.
-	 * @param modname The module name
-	 * @param loadernick The nickname of the user loading the module.
-	 * @param type The module type
+	/** What type this module is
 	 */
-	Module(const Anope::string &modname, const Anope::string &loadernick, ModType type = THIRD);
+	MODType type;
+
+	/** Creates and initialises a new module.
+	 * @param loadernick The nickname of the user loading the module.
+	 */
+	Module(const Anope::string &modname, const Anope::string &loadernick);
 
 	/** Destroys a module, freeing resources it has allocated.
 	 */
 	virtual ~Module();
 
+	/** Sets a given type (CORE,PROTOCOL,3RD etc) on a module.
+	 * @param type The type to set the module as.
+	 */
+	void SetType(MODType type);
+
 	/** Toggles the permanent flag on a module. If a module is permanent,
 	 * then it may not be unloaded.
 	 *
@@ -249,6 +283,28 @@ class CoreExport Module : public Extensible
 	 */
 	Version GetVersion() const;
 
+	/** Send a message to a user in their language, if a translation is available
+	 * @param source The source of the message
+	 * @param fmt The message
+	 */
+	void SendMessage(CommandSource &source, const char *fmt, ...);
+
+	/**
+	 * Add a module provided command to the given service.
+	 * @param bi The service to add the command to
+	 * @param c The command to add
+	 * @return MOD_ERR_OK on successfully adding the command
+	 */
+	int AddCommand(BotInfo *bi, Command *c);
+
+	/**
+	 * Delete a command from the service given.
+	 * @param bi The service to remove the command from
+	 * @param c Thec command to delete
+	 * @return returns MOD_ERR_OK on success
+	 */
+	int DelCommand(BotInfo *bi, Command *c);
+
 	/** Called when the ircd notifies that a user has been kicked from a channel.
 	 * @param c The channel the user has been kicked from.
 	 * @param target The user that has been kicked.
@@ -258,8 +314,9 @@ class CoreExport Module : public Extensible
 	virtual void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &kickmsg) { }
 
 	/** Called when Services' configuration has been loaded.
+	 * @param startup True if Services is starting for the first time, false otherwise.
 	 */
-	virtual void OnReload() { }
+	virtual void OnReload(bool startup) {}
 
 	/** Called before a bot is assigned to a channel.
 	 * @param sender The user assigning the bot
@@ -276,11 +333,20 @@ class CoreExport Module : public Extensible
 	 */
 	virtual EventReturn OnBotUnAssign(User *sender, ChannelInfo *ci) { return EVENT_CONTINUE; }
 
+	/** Called after a user has been introduced, but before any type
+	 * of checking has been done (akills, defcon, s*lines, etc)
+	 * return EVENT_STOP here to allow the user to get by untouched,
+	 * or kill them then return EVENT_STOP to tell Anope the user no
+	 * longer exists
+	 * @param u The user
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to stop processing
+	 */
+	virtual EventReturn OnPreUserConnect(User *u) { return EVENT_CONTINUE; }
+
 	/** Called when a new user connects to the network.
 	 * @param u The connecting user.
-	 * @param exempt set to true/is true if the user should be excepted from bans etc
 	 */
-	virtual void OnUserConnect(dynamic_reference<User> &u, bool &exempt) { }
+	virtual void OnUserConnect(User *u) { }
 
 	/** Called when a new server connects to the network.
 	 * @param s The server that has connected to the network
@@ -293,18 +359,15 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnUserNickChange(User *u, const Anope::string &oldnick) { }
 
-	/** Called when someone uses the generic/help command
-	 * @param source Command source
-	 * @param params Params
-	 * @return EVENT_STOP to stop processing
+	/** Called immediatly when a user tries to run a command
+	 * @param u The user
+	 * @param bi The bot the command is being run from
+	 * @param command The command
+	 * @param message The parameters used for the command
+	 * @param ci If a tanasy command, the channel the comman was used on
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
 	 */
-	virtual EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
-
-	/** Called when someone uses the generic/help command
-	 * @param source Command source
-	 * @param params Params
-	 */
-	virtual void OnPostHelp(CommandSource &source, const std::vector<Anope::string> &params) { }
+	virtual EventReturn OnPreCommandRun(User *&u, BotInfo *&bi, Anope::string &command, Anope::string &message, ChannelInfo *&ci) { return EVENT_CONTINUE; }
 
 	/** Called before a command is due to be executed.
 	 * @param source The source of the command
@@ -312,7 +375,7 @@ class CoreExport Module : public Extensible
 	 * @param params The parameters the user is sending
 	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
 	 */
-	virtual EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
+	virtual EventReturn OnPreCommand(CommandSource &source, Command *command, const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
 
 	/** Called after a command has been executed.
 	 * @param source The source of the command
@@ -321,6 +384,11 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnPostCommand(CommandSource &source, Command *command, const std::vector<Anope::string> &params) { }
 
+	/** Called after the core has finished loading the databases, but before
+	 * we connect to the server
+	 */
+	virtual void OnPostLoadDatabases() { }
+
 	/** Called when the databases are saved
 	 * @return EVENT_CONTINUE to let other modules continue saving, EVENT_STOP to stop
 	 */
@@ -406,13 +474,6 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg) { }
 
-	/** Called when a user leaves a channel.
-	 * From either parting, being kicked, or quitting/killed!
-	 * @param u The user
-	 * @param c The channel
-	 */
-	virtual void OnLeaveChannel(User *u, Channel *c) { }
-
 	/** Called before a user joins a channel
 	 * @param u The user
 	 * @param c The channel
@@ -434,18 +495,21 @@ class CoreExport Module : public Extensible
 
 	/** Called before a channel expires
 	 * @param ci The channel
-	 * @param expire Set to true to allow the chan to expire
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
 	 */
-	virtual void OnPreChanExpire(ChannelInfo *ci, bool &expire) { }
+	virtual EventReturn OnPreChanExpire(ChannelInfo *ci) { return EVENT_CONTINUE; }
 
 	/** Called before a channel expires
 	 * @param ci The channel
 	 */
 	virtual void OnChanExpire(ChannelInfo *ci) { }
 
-	/** Called before Anope connecs to its uplink
+	/** Called before Anope connects to its uplink
+	 * @param u The uplink we're going to connect to
+	 * @param Number What number the uplink is
+	 * @return Other than EVENT_CONTINUE to stop attempting to connect
 	 */
-	virtual void OnPreServerConnect() { }
+	virtual EventReturn OnPreServerConnect(Uplink *u, int Number) { return EVENT_CONTINUE; }
 
 	/** Called when Anope connects to its uplink
 	 */
@@ -459,19 +523,110 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnServerDisconnect() { }
 
+	/** Called before the database expire routines are called
+	* Note: Code that is in seperate expiry routines should just be done
+	* when we save the DB, theres no need to have both
+	*/
+	virtual void OnPreDatabaseExpire() { }
+
+	/** Called when the database expire routines are called
+	 */
+	virtual void OnDatabaseExpire() { }
+
+	/** Called when the flatfile dbs are being written
+	 * @param Write A callback to the function used to insert a line into the database
+	 */
+	virtual void OnDatabaseWrite(void (*Write)(const Anope::string &)) { }
+
+	/** Called when a line is read from the database
+	 * @param params The params from the database
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to stop processing
+	 */
+	virtual EventReturn OnDatabaseRead(const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
+
+	/** Called when nickcore metadata is read from the database
+	 * @param nc The nickcore
+	 * @param key The metadata key
+	 * @param params The params from the database
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to stop processing
+	 */
+	virtual EventReturn OnDatabaseReadMetadata(NickCore *nc, const Anope::string &key, const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
+
+	/** Called when nickcore metadata is read from the database
+	 * @param na The nickalias
+	 * @param key The metadata key
+	 * @param params The params from the database
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to stop processing
+	 */
+	virtual EventReturn OnDatabaseReadMetadata(NickAlias *na, const Anope::string &key, const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
+
+	/** Called when botinfo metadata is read from the database
+	 * @param bi The botinfo
+	 * @param key The metadata key
+	 * @param params The params from the database
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to stop processing
+	 */
+	virtual EventReturn OnDatabaseReadMetadata(BotInfo *bi, const Anope::string &key, const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
+
+	/** Called when chaninfo metadata is read from the database
+	 * @param ci The chaninfo
+	 * @param key The metadata key
+	 * @param params The params from the database
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to stop processing
+	 */
+	virtual EventReturn OnDatabaseReadMetadata(ChannelInfo *ci, const Anope::string &key, const std::vector<Anope::string> &params) { return EVENT_CONTINUE; }
+
+	/** Called when we are writing metadata for a nickcore
+	 * @param WriteMetata A callback function used to insert the metadata
+	 * @param nc The nickcore
+	 */
+	virtual void OnDatabaseWriteMetadata(void (*WriteMetadata)(const Anope::string &, const Anope::string &), NickCore *nc) { }
+
+	/** Called when we are wrting metadata for a nickalias
+	 * @param WriteMetata A callback function used to insert the metadata
+	 * @param na The nick alias
+	 */
+	virtual void OnDatabaseWriteMetadata(void (*WriteMetadata)(const Anope::string &, const Anope::string &), NickAlias *na) { }
+
+	/** Called when we are writing metadata for a botinfo
+	 * @param WriteMetata A callback function used to insert the metadata
+	 * @param bi The botinfo
+	 */
+	virtual void OnDatabaseWriteMetadata(void (*WriteMetadata)(const Anope::string &, const Anope::string &), BotInfo *bi) { }
+
+	/** Called when are are writing metadata for a channelinfo
+	 * @param WriteMetata A callback function used to insert the metadata
+	 * @param bi The channelinfo
+	 */
+	virtual void OnDatabaseWriteMetadata(void (*WriteMetadata)(const Anope::string &, const Anope::string &), ChannelInfo *ci) { }
+
+	/** Called before services restart
+	*/
+	virtual void OnPreRestart() { }
+
 	/** Called when services restart
 	*/
 	virtual void OnRestart() { }
 
+	/** Called before services shutdown
+	 */
+	virtual void OnPreShutdown() { }
+
 	/** Called when services shutdown
 	 */
 	virtual void OnShutdown() { }
 
+	/** Called on signal
+	 * @param signum The signum
+	 * @param msg The quitmsg
+	 */
+	virtual void OnSignal(int signum, const Anope::string &msg) { }
+
 	/** Called before a nick expires
 	 * @param na The nick
-	 * @param expire Set to true to allow the nick to expire
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
 	 */
-	virtual void OnPreNickExpire(NickAlias *na, bool &expire) { }
+	virtual EventReturn OnPreNickExpire(NickAlias *na) { return EVENT_CONTINUE; }
 
 	/** Called when a nick drops
 	 * @param na The nick
@@ -483,11 +638,25 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnDefconLevel(int level) { }
 
+	/** Called before an akill is added
+	 * @param u The user adding the akill
+	 * @param ak The akill
+	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
+	 */
+	virtual EventReturn OnAddAkill(User *u, XLine *ak) { return EVENT_CONTINUE; }
+
+	/** Called before an akill is deleted
+	 * @param u The user removing the akill
+	 * @param ak The akill, can be NULL for all akills!
+	 */
+	virtual void OnDelAkill(User *u, XLine *ak) { }
+
 	/** Called after an exception has been added
+	 * @param u The user who added it
 	 * @param ex The exception
 	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
 	 */
-	virtual EventReturn OnExceptionAdd(Exception *ex) { return EVENT_CONTINUE; }
+	virtual EventReturn OnExceptionAdd(User *u, Exception *ex) { return EVENT_CONTINUE; }
 
 	/** Called before an exception is deleted
 	 * @param u The user who is deleting it
@@ -497,24 +666,18 @@ class CoreExport Module : public Extensible
 
 	/** Called before a XLine is added
 	 * @param u The user adding the XLine
-	 * @param x The XLine
-	 * @param xlm The xline manager it was added to
+	 * @param sx The XLine
+	 * @param Type The type of XLine this is
 	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to halt the command and not process it
 	 */
-	virtual EventReturn OnAddXLine(User *u, XLine *x, XLineManager *xlm) { return EVENT_CONTINUE; }
+	virtual EventReturn OnAddXLine(User *u, XLine *x, XLineType Type) { return EVENT_CONTINUE; }
 
 	/** Called before a XLine is deleted
 	 * @param u The user deleting the XLine
-	 * @param x The XLine, can be NULL for all XLines
-	 * @param xlm The xline manager it was deleted from
+	 * @param sx The XLine, can be NULL for all XLines
+	 * @param Type The type of XLine this is
 	 */
-	virtual void OnDelXLine(User *u, XLine *x, XLineManager *xlm) { }
-
-	/** Called when a user is checked for whether they are a services oper
-	 * @param u The user
-	 * @return EVENT_ALLOW to allow, anything else to deny
-	 */
-	virtual EventReturn IsServicesOper(User *u) { return EVENT_CONTINUE; }
+	virtual void OnDelXLine(User *u, XLine *x, XLineType Type) { }
 
 	/** Called when a server quits
 	 * @param server The server
@@ -554,6 +717,13 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access) { }
 
+	/** Called when access is changed
+	 * @param ci The channel
+	 * @param u The user who changed the access
+	 * @param u access The access changed
+	 */
+	virtual void OnAccessChange(ChannelInfo *ci, User *u, ChanAccess *access) { }
+
 	/** Called when access is added
 	 * @param ci The channel
 	 * @param u The user who added the access
@@ -570,16 +740,21 @@ class CoreExport Module : public Extensible
 	/** Called when a level for a channel is changed
 	 * @param u The user changing the level
 	 * @param ci The channel the level was changed on
-	 * @param priv The privilege changed
+	 * @param pos The level position, can be -1 for resetting levels
 	 * @param what The new level
 	 */
-	virtual void OnLevelChange(User *u, ChannelInfo *ci, const Anope::string &priv, int16_t what) { }
+	virtual void OnLevelChange(User *u, ChannelInfo *ci, int pos, int what) { }
 
 	/** Called when a channel is dropped
 	 * @param chname The channel name
 	 */
 	virtual void OnChanDrop(const Anope::string &chname) { }
 
+	/** Called when a channel is forbidden
+	 * @param ci The channel
+	 */
+	virtual void OnChanForbidden(ChannelInfo *ci) { }
+
 	/** Called when a channel is registered
 	 * @param ci The channel
 	 */
@@ -595,11 +770,6 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnChanUnsuspend(ChannelInfo *ci) { }
 
-	/** Called when a channel is being created, for any reason
-	 * @param ci The channel
-	 */
-	virtual void OnCreateChan(ChannelInfo *ci) { }
-
 	/** Called when a channel is being deleted, for any reason
 	 * @param ci The channel
 	 */
@@ -629,41 +799,18 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnAkickDel(User *u, ChannelInfo *ci, AutoKick *ak) { }
 
-	/** Called after a user join a channel when we decide whether to kick them or not
-	 * @param u The user
-	 * @param ci The channel
-	 * @param kick Set to true to kick
-	 * @return EVENT_ALLOW to stop processing immediatly
-	 */
-	virtual EventReturn OnCheckKick(User *u, ChannelInfo *ci, bool &kick) { return EVENT_CONTINUE; }
-
 	/** Called when a user requests info for a channel
 	 * @param source The user requesting info
 	 * @param ci The channel the user is requesting info for
-	 * @param info Data to show the user requesting information
 	 * @param ShowHidden true if we should show the user everything
 	 */
-	virtual void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden) { }
+	virtual void OnChanInfo(CommandSource &source, ChannelInfo *ci, bool ShowHidden) { }
 
 	/** Called on cs_findchan()
 	 * @param chname The name being looked up
 	 */
 	virtual void OnFindChan(const Anope::string &chname) { }
 
-	/** Checks if access has the channel privilege 'priv'.
-	 * @param access THe access struct
-	 * @param priv The privilege being checked for
-	 * @return EVENT_ALLOW for yes, EVENT_STOP to stop all processing
-	 */
-	virtual EventReturn OnCheckPriv(ChanAccess *access, const Anope::string &priv) { return EVENT_CONTINUE; }
-
-	/** Check whether an access group has a privilege
-	 * @param group The group
-	 * @param priv The privilege
-	 * @return MOD_ALLOW to allow, MOD_STOP to stop
-	 */
-	virtual EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv) { return EVENT_CONTINUE; }
-
 	/** Called when a nick is dropped
 	 * @param u The user dropping the nick
 	 * @param na The nick
@@ -759,10 +906,9 @@ class CoreExport Module : public Extensible
 	/** Called when a user requests info for a nick
 	 * @param source The user requesting info
 	 * @param na The nick the user is requesting info from
-	 * @param info Data to show the user requesting information
 	 * @param ShowHidden true if we should show the user everything
 	 */
-	virtual void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool ShowHidden) { }
+	virtual void OnNickInfo(CommandSource &source, NickAlias *na, bool ShowHidden) { }
 
 	/** Called in findnick()
 	 * Useful to modify the na returned by findnick()
@@ -784,12 +930,7 @@ class CoreExport Module : public Extensible
 	 * @param password The password
 	 * @return EVENT_ALLOW to allow the password, EVENT_STOP to stop processing completely
 	 */
-	virtual EventReturn OnCheckAuthentication(Command *c, CommandSource *source, const std::vector<Anope::string> &params, const Anope::string &account, const Anope::string &password) { return EVENT_CONTINUE; }
-
-	/** Called when a user does /ns update
-	 * @param u The user
-	 */
-	virtual void OnNickUpdate(User *u) { }
+	virtual EventReturn OnCheckAuthentication(User *u, Command *c, const std::vector<Anope::string> &params, const Anope::string &account, const Anope::string &password) { return EVENT_CONTINUE; }
 
 	/** Called when we get informed about a users SSL fingerprint
 	 *  when we call this, the fingerprint should already be stored in the user struct
@@ -797,11 +938,6 @@ class CoreExport Module : public Extensible
 	 */
 	virtual void OnFingerprint(User *u) { }
 
-	/** Called when a user becomes (un)away
-	 * @param message The message, is .empty() if unaway
-	 */
-	virtual void OnUserAway(User *u, const Anope::string &message) { }
-
 	/** Called when a vhost is deleted
 	 * @param na The nickalias of the vhost
 	 */
@@ -813,12 +949,18 @@ class CoreExport Module : public Extensible
 	virtual void OnSetVhost(NickAlias *na) { }
 
 	/** Called when a memo is sent
-	 * @param source The source of the memo
-	 * @param target The target of the memo
-	 * @param mi Memo info for target
+	 * @param u The user sending the memo
+	 * @param nc The nickcore of who the memo was sent to
 	 * @param m The memo
 	 */
-	virtual void OnMemoSend(const Anope::string &source, const Anope::string &target, MemoInfo *mi, Memo *m) { }
+	virtual void OnMemoSend(User *u, NickCore *nc, Memo *m) { }
+
+	/** Called when a memo is sent
+	 * @param u The user sending the memo
+	 * @param ci The channel the memo was sent to
+	 * @param m The memo
+	 */
+	virtual void OnMemoSend(User *u, ChannelInfo *ci, Memo *m) { }
 
 	/** Called when a memo is deleted
 	 * @param nc The nickcore of the memo being deleted
@@ -883,10 +1025,10 @@ class CoreExport Module : public Extensible
 
 	/** Called when a mode is about to be unlocked
 	 * @param ci The channel the mode is being unlocked from
-	 * @param lock The mode lock
+	 * @param mode The mode being unlocked
 	 * @return EVENT_CONTINUE to let other modules decide, EVENT_STOP to deny the mlock.
 	 */
-	virtual EventReturn OnUnMLock(ChannelInfo *ci, ModeLock *lock) { return EVENT_CONTINUE; }
+	virtual EventReturn OnUnMLock(ChannelInfo *ci, ChannelMode *mode, const Anope::string &param) { return EVENT_CONTINUE; }
 
 	/** Called after a module is loaded
 	 * @param u The user loading the module, can be NULL
@@ -916,19 +1058,21 @@ class CoreExport Module : public Extensible
 	 * @param message The message
 	 * @return EVENT_STOP to halt processing
 	 */
-	virtual EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) { return EVENT_CONTINUE; }
+	virtual EventReturn OnBotPrivmsg(User *u, BotInfo *bi, const Anope::string &message) { return EVENT_CONTINUE; }
 
 	/** Called when we receive a PRIVMSG for a registered channel we are in
 	 * @param u The source of the message
-	 * @param c The channel
+	 * @param ci The channel
 	 * @param msg The message
+	 * @param Allow set to false to make the flood kickers halt
+	 * @return MOD_STOP to stop processing completely
 	 */
-	virtual void OnPrivmsg(User *u, Channel *c, Anope::string &msg) { }
+	virtual EventReturn OnPrivmsg(User *u, ChannelInfo *ci, Anope::string &msg, bool &Allow) { return EVENT_CONTINUE; }
 
-	/** Called when a message is logged
-	 * @param l The log message
+	/** Called when any object is destroyed
+	 * @param b The object
 	 */
-	virtual void OnLog(Log *l) { }
+	virtual void OnObjectDestroy(Base *b) { }
 };
 
 /** Implementation-specific flags which may be set in ModuleManager::Attach()
@@ -943,13 +1087,12 @@ enum Implementation
 		I_OnNickClearAccess, I_OnNickAddAccess, I_OnNickEraseAccess,
 		I_OnNickClearCert, I_OnNickAddCert, I_OnNickEraseCert,
 		I_OnNickInfo, I_OnFindNick, I_OnFindCore, I_OnCheckAuthentication,
-		I_OnNickUpdate,
 
 		/* ChanServ */
-		I_OnChanSuspend, I_OnChanDrop, I_OnPreChanExpire, I_OnChanExpire, I_OnAccessAdd,
-		I_OnAccessDel, I_OnAccessClear, I_OnLevelChange, I_OnChanRegistered, I_OnChanUnsuspend, I_OnCreateChan, I_OnDelChan, I_OnChannelCreate,
-		I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel, I_OnCheckKick,
-		I_OnChanInfo, I_OnFindChan, I_OnCheckPriv, I_OnGroupCheckPriv,
+		I_OnChanForbidden, I_OnChanSuspend, I_OnChanDrop, I_OnPreChanExpire, I_OnChanExpire, I_OnAccessAdd, I_OnAccessChange,
+		I_OnAccessDel, I_OnAccessClear, I_OnLevelChange, I_OnChanRegistered, I_OnChanUnsuspend, I_OnDelChan, I_OnChannelCreate,
+		I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel,
+		I_OnChanInfo, I_OnFindChan,
 
 		/* BotServ */
 		I_OnBotJoin, I_OnBotKick, I_OnBotCreate, I_OnBotChange, I_OnBotDelete, I_OnBotAssign, I_OnBotUnAssign,
@@ -962,42 +1105,51 @@ enum Implementation
 		I_OnMemoSend, I_OnMemoDel,
 
 		/* Users */
-		I_OnUserConnect, I_OnUserNickChange, I_OnUserQuit, I_OnUserLogoff, I_OnPreJoinChannel,
-		I_OnJoinChannel, I_OnPrePartChannel, I_OnPartChannel, I_OnLeaveChannel, I_OnFingerprint, I_OnUserAway,
+		I_OnPreUserConnect, I_OnUserConnect, I_OnUserNickChange, I_OnUserQuit, I_OnUserLogoff, I_OnPreJoinChannel,
+		I_OnJoinChannel, I_OnPrePartChannel, I_OnPartChannel, I_OnFingerprint,
 
 		/* OperServ */
 		I_OnDefconLevel, I_OnAddAkill, I_OnDelAkill, I_OnExceptionAdd, I_OnExceptionDel,
-		I_OnAddXLine, I_OnDelXLine, I_IsServicesOper,
+		I_OnAddXLine, I_OnDelXLine,
 
 		/* Database */
-		I_OnSaveDatabase, I_OnLoadDatabase,
+		I_OnPostLoadDatabases, I_OnSaveDatabase, I_OnLoadDatabase,
+		I_OnDatabaseExpire,
+		I_OnDatabaseWrite, I_OnDatabaseRead, I_OnDatabaseReadMetadata, I_OnDatabaseWriteMetadata,
 
 		/* Modules */
 		I_OnModuleLoad, I_OnModuleUnload,
 
 		/* Other */
-		I_OnReload, I_OnNewServer, I_OnPreServerConnect, I_OnServerConnect, I_OnPreUplinkSync, I_OnServerDisconnect,
-		I_OnPreHelp, I_OnPostHelp, I_OnPreCommand, I_OnPostCommand, I_OnRestart, I_OnShutdown,
+		I_OnReload, I_OnPreServerConnect, I_OnNewServer, I_OnServerConnect, I_OnPreUplinkSync, I_OnServerDisconnect, I_OnPreCommandRun,
+		I_OnPreCommand, I_OnPostCommand, I_OnPreDatabaseExpire, I_OnPreRestart, I_OnRestart, I_OnPreShutdown, I_OnShutdown, I_OnSignal,
 		I_OnServerQuit, I_OnTopicUpdated,
 		I_OnEncrypt, I_OnDecrypt,
 		I_OnChannelModeSet, I_OnChannelModeUnset, I_OnUserModeSet, I_OnUserModeUnset, I_OnChannelModeAdd, I_OnUserModeAdd,
-		I_OnMLock, I_OnUnMLock, I_OnServerSync, I_OnUplinkSync, I_OnBotPrivmsg, I_OnPrivmsg, I_OnLog,
+		I_OnMLock, I_OnUnMLock, I_OnServerSync, I_OnUplinkSync, I_OnBotPrivmsg, I_OnPrivmsg, I_OnObjectDestroy,
 	I_END
 };
 
+class Service;
+
 /** Used to manage modules.
  */
 class CoreExport ModuleManager
 {
+ private:
+	/** A map of service providers
+	 */
+	static std::map<Anope::string, Service *> ServiceProviders;
  public:
 	/** Event handler hooks.
 	 * This needs to be public to be used by FOREACH_MOD and friends.
 	 */
 	static std::vector<Module *> EventHandlers[I_END];
 
-	/** Clean up the module runtime directory
-	 */
-	static void CleanupRuntimeDirectory();
+	/** Load up a list of modules.
+	 * @param module_list The list of modules to load
+	 **/
+	static void LoadModuleList(std::list<Anope::string> &ModList);
 
 	/** Loads a given module.
 	 * @param m the module to load
@@ -1013,27 +1165,6 @@ class CoreExport ModuleManager
 	 */
 	static ModuleReturn UnloadModule(Module *m, User * u);
 
-	/** Find a module
-	 * @param name The module name
-	 * @return The module
-	 */
-	static Module *FindModule(const Anope::string &name);
-
-	/** Find the first module of a certain type
-	 * @param type The module type
-	 * @return The module
-	 */
-	static Module *FindFirstOf(ModType type);
-
-	/** 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 patch The patch version
-	 * @param build The build version
-	 */
-	static void RequireVersion(int major, int minor, int patch, int build);
-
 	/** Change the priority of one event in a module.
 	 * Each module event has a list of modules which are attached to that event type. If you wish to be called before or after other specific modules, you may use this
 	 * method (usually within void Module::Prioritize()) to set your events priority. You may use this call in other methods too, however, this is not supported behaviour
@@ -1091,16 +1222,34 @@ class CoreExport ModuleManager
 	 */
 	static void ClearCallBacks(Module *m);
 
-	/** Unloading all modules except the protocol module.
+	/** Unloading all modules, NEVER call this when Anope isn't shutting down.
+	 * Ever.
 	 */
 	static void UnloadAll();
 
+	/** Register a service
+	 * @param s The service
+	 * @return true if it was successfully registeed, else false (service name colision)
+	 */
+	static bool RegisterService(Service *s);
+
+	/** Unregister a service
+	 * @param s The service
+	 * @return true if it was unregistered successfully
+	 */
+	static bool UnregisterService(Service *s);
+
+	/** Get a service
+	 * @param name The service name
+	 * @return The services, or NULL
+	 */
+	static Service *GetService(const Anope::string &name);
+
  private:
 	/** Call the module_delete function to safely delete the module
 	 * @param m the module to delete
-	 * @return MOD_ERR_OK on success, anything else on fail
 	 */
-	static ModuleReturn DeleteModule(Module *m);
+	static void DeleteModule(Module *m);
 };
 
 /** Class used for callbacks within modules
@@ -1123,20 +1272,29 @@ class CallBack : public Timer
 	}
 };
 
+class CoreExport Service : public Base
+{
+ public:
+	Module *owner;
+	Anope::string name;
+
+	Service(Module *o, const Anope::string &n);
+
+	virtual ~Service();
+};
+
 template<typename T>
 class service_reference : public dynamic_reference<T>
 {
-	Anope::string type;
 	Anope::string name;
 
  public:
-	service_reference(const Anope::string &t, const Anope::string &n) : dynamic_reference<T>(NULL), type(t), name(n)
+	service_reference(const Anope::string &n) : dynamic_reference<T>(static_cast<T *>(ModuleManager::GetService(n))), name(n)
 	{
 	}
 
-	inline void operator=(const Anope::string &n)
+	virtual ~service_reference()
 	{
-		this->name = n;
 	}
 
 	operator bool()
@@ -1148,7 +1306,7 @@ class service_reference : public dynamic_reference<T>
 		}
 		if (!this->ref)
 		{
-			this->ref = static_cast<T *>(Service::FindService(this->type, this->name));
+			this->ref = static_cast<T *>(ModuleManager::GetService(this->name));
 			if (this->ref)
 				this->ref->AddReference(this);
 		}

include/operserv.h

@@ -1,17 +1,48 @@
 /* OperServ support
  *
- * (C) 2008-2012 Anope Team
+ * (C) 2008-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
  */
 
-#ifndef OPER_H
-#define OPER_H
+#ifndef OPERSERV_H
+#define OPERSERV_H
+
+extern CoreExport std::vector<NewsItem *> News;
+extern CoreExport std::vector<std::bitset<32> > DefCon;
+extern CoreExport bool DefConModesSet;
+extern CoreExport Flags<ChannelModeName, CMODE_END * 2> DefConModesOn;
+extern CoreExport Flags<ChannelModeName, CMODE_END * 2> DefConModesOff;
+extern CoreExport std::map<ChannelModeName, Anope::string> DefConModesOnParams;
 
 class XLineManager;
+extern CoreExport XLineManager *SGLine;
+extern CoreExport XLineManager *SZLine;
+extern CoreExport XLineManager *SQLine;
+extern CoreExport XLineManager *SNLine;
 
-class CoreExport XLine : public Serializable
+extern CoreExport bool SetDefConParam(ChannelModeName, const Anope::string &);
+extern CoreExport bool GetDefConParam(ChannelModeName, Anope::string &);
+extern CoreExport void UnsetDefConParam(ChannelModeName);
+extern CoreExport bool CheckDefCon(DefconLevel Level);
+extern CoreExport bool CheckDefCon(int level, DefconLevel Level);
+extern CoreExport void AddDefCon(int level, DefconLevel Level);
+extern CoreExport void DelDefCon(int level, DefconLevel Level);
+
+extern CoreExport void os_init();
+
+extern CoreExport void oper_global(const Anope::string &nick, const char *fmt, ...);
+extern CoreExport void server_global(const Server *s, const Anope::string &message);
+
+enum XLineType
+{
+	X_SNLINE,
+	X_SQLINE,
+	X_SZLINE
+};
+
+class CoreExport XLine
 {
  public:
 	Anope::string Mask;
@@ -19,33 +50,34 @@ class CoreExport XLine : public Serializable
 	time_t Created;
 	time_t Expires;
 	Anope::string Reason;
-	XLineManager *manager;
-	Anope::string UID;
 
-	XLine(const Anope::string &mask, const Anope::string &reason = "", const Anope::string &uid = "");
+	XLine(const Anope::string &mask, const Anope::string &reason = "");
 
-	XLine(const Anope::string &mask, const Anope::string &by, const time_t expires, const Anope::string &reason, const Anope::string &uid);
+	XLine(const Anope::string &mask, const Anope::string &by, const time_t expires, const Anope::string &reason);
 
 	Anope::string GetNick() const;
 	Anope::string GetUser() const;
 	Anope::string GetHost() const;
-	sockaddrs GetIP() const;
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &data);
 };
 
-class CoreExport XLineManager : public Service
+class CoreExport XLineManager
 {
-	char type;
-	/* List of XLines in this XLineManager */
-	std::vector<XLine *> XLines;
-	static std::map<Anope::string, XLine *, ci::less> XLinesByUID;
- public:
+ private:
 	/* List of XLine managers we check users against in XLineManager::CheckAll */
 	static std::list<XLineManager *> XLineManagers;
 
+ protected:
+	/* List of XLines in this XLineManager */
+	std::vector<XLine *> XLines;
+ public:
+	/** Constructor
+	 */
+	XLineManager();
+
+	/** Destructor
+	 */
+	virtual ~XLineManager();
+
 	/** Register a XLineManager, places it in XLineManagers for use in XLineManager::CheckAll
 	 * It is important XLineManagers are registered in the proper order. Eg, if you had one akilling
 	 * clients and one handing them free olines, you would want the akilling one first. This way if a client
@@ -65,24 +97,6 @@ class CoreExport XLineManager : public Service
 	 */
 	static std::pair<XLineManager *, XLine *> CheckAll(User *u);
 
-	/** Generate a unique ID for this XLine
-	 * @return A unique ID
-	 */
-	static Anope::string GenerateUID();
-
-	/** Constructor
-	 */
-	XLineManager(Module *creator, const Anope::string &name, char t);
-
-	/** Destructor
-	 */
-	virtual ~XLineManager();
-
-	/** The type of xline provided by this service
-	 * @return The type
-	 */
-	const char &Type();
-
 	/** Get the number of XLines in this XLineManager
 	 * @return The number of XLines
 	 */
@@ -111,10 +125,26 @@ class CoreExport XLineManager : public Service
 	XLine *GetEntry(unsigned index);
 
 	/** Clear the XLine vector
-	 * Note: This does not remove the XLines from the IRCd
 	 */
 	void Clear();
 
+	/** Add an entry to this XLine Manager
+	 * @param bi The bot error replies should be sent from
+	 * @param u The user adding the XLine
+	 * @param mask The mask of the XLine
+	 * @param expires When this should expire
+	 * @param reaosn The reason
+	 * @return A pointer to the XLine
+	 */
+	virtual XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason);
+
+ private:
+	/** Delete an XLine, eg, remove it from the IRCd.
+	 * @param x The xline
+	 */
+	virtual void Del(XLine *x);
+
+ public:
 	/** Checks if a mask can/should be added to the XLineManager
 	 * @param mask The mask
 	 * @param expires When the mask would expire
@@ -154,11 +184,67 @@ class CoreExport XLineManager : public Service
 	 * @param x The xline
 	 */
 	virtual void Send(User *u, XLine *x) = 0;
-
-	/** Called to remove an XLine from the IRCd
-	 * @param x The XLine
-	 */
-	virtual void SendDel(XLine *x) = 0;
 };
 
-#endif // OPER_H
+/* This is for AKILLS */
+class SGLineManager : public XLineManager
+{
+ public:
+	XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason);
+
+	void Del(XLine *x);
+
+	void OnMatch(User *u, XLine *x);
+
+	void OnExpire(XLine *x);
+	
+	void Send(User *u, XLine *x);
+};
+
+class SNLineManager : public XLineManager
+{
+ public:
+	XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason);
+
+	void Del(XLine *x);
+
+	void OnMatch(User *u, XLine *x);
+
+	void OnExpire(XLine *x);
+
+	void Send(User *u, XLine *x);
+
+	XLine *Check(User *u);
+};
+
+class SQLineManager : public XLineManager
+{
+ public:
+	XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason);
+
+	void Del(XLine *x);
+
+	void OnMatch(User *u, XLine *x);
+
+	void OnExpire(XLine *x);
+
+	void Send(User *u, XLine *x);
+
+	static bool Check(Channel *c);
+};
+
+class SZLineManager : public XLineManager
+{
+ public:
+	XLine *Add(BotInfo *bi, User *u, const Anope::string &mask, time_t expires, const Anope::string &reason);
+
+	void Del(XLine *x);
+
+	void OnMatch(User *u, XLine *x);
+
+	void OnExpire(XLine *x);
+
+	void Send(User *u, XLine *x);
+};
+
+#endif // OPERSERV_H

include/opertype.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2011 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -12,21 +12,15 @@
 
 class OperType;
 
-struct CoreExport Oper
+struct Oper
 {
 	Anope::string name;
-	OperType *ot;
-	bool require_oper;
 	Anope::string password;
 	Anope::string certfp;
-	bool config;
+	OperType *ot;
 
-	std::vector<Anope::string> hosts;
-	Anope::string vhost;
-
-	Oper(const Anope::string &n, OperType *o) : name(n), ot(o) { this->config = false; }
-
-	virtual ~Oper() { }
+	Oper(const Anope::string &n, const Anope::string &p, const Anope::string &c, OperType *o) :
+		name(n), password(p), certfp(c), ot(o) { }
 	
 	/** Find an oper block by name
 	 * @param name The name
@@ -61,10 +55,6 @@ class CoreExport OperType
 	 */
 	std::set<OperType *> inheritances;
  public:
- 	/** Modes to set when someone identifys using this opertype
-	 */
-	Anope::string modes;
-
 	/** Find an oper type by name
 	 * @param name The name
 	 * @return The oper type
@@ -110,12 +100,12 @@ class CoreExport OperType
 	/** Gets the icommands for this opertype
 	 * @return A list of commands
 	 */
-	const std::list<Anope::string> GetCommands() const;
+	const std::list<Anope::string> &GetCommands() const;
 
 	/** Gets the privileges for this opertype
 	 * @return A list of privileges
 	 */
-	const std::list<Anope::string> GetPrivs() const;
+	const std::list<Anope::string> &GetPrivs() const;
 };
 
 #endif // OPERTYPE_H

include/pstdint.h

@@ -1,800 +0,0 @@
-/*  A portable stdint.h
- ****************************************************************************
- *  BSD License:
- ****************************************************************************
- *
- *  Copyright (c) 2005-2011 Paul Hsieh
- *  All rights reserved.
- *  
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *  
- *  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- *  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************
- *
- *  Version 0.1.12
- *
- *  The ANSI C standard committee, for the C99 standard, specified the
- *  inclusion of a new standard include file called stdint.h.  This is
- *  a very useful and long desired include file which contains several
- *  very precise definitions for integer scalar types that is
- *  critically important for making portable several classes of
- *  applications including cryptography, hashing, variable length
- *  integer libraries and so on.  But for most developers its likely
- *  useful just for programming sanity.
- *
- *  The problem is that most compiler vendors have decided not to
- *  implement the C99 standard, and the next C++ language standard
- *  (which has a lot more mindshare these days) will be a long time in
- *  coming and its unknown whether or not it will include stdint.h or
- *  how much adoption it will have.  Either way, it will be a long time
- *  before all compilers come with a stdint.h and it also does nothing
- *  for the extremely large number of compilers available today which
- *  do not include this file, or anything comparable to it.
- *
- *  So that's what this file is all about.  Its an attempt to build a
- *  single universal include file that works on as many platforms as
- *  possible to deliver what stdint.h is supposed to.  A few things
- *  that should be noted about this file:
- *
- *    1) It is not guaranteed to be portable and/or present an identical
- *       interface on all platforms.  The extreme variability of the
- *       ANSI C standard makes this an impossibility right from the
- *       very get go. Its really only meant to be useful for the vast
- *       majority of platforms that possess the capability of
- *       implementing usefully and precisely defined, standard sized
- *       integer scalars.  Systems which are not intrinsically 2s
- *       complement may produce invalid constants.
- *
- *    2) There is an unavoidable use of non-reserved symbols.
- *
- *    3) Other standard include files are invoked.
- *
- *    4) This file may come in conflict with future platforms that do
- *       include stdint.h.  The hope is that one or the other can be
- *       used with no real difference.
- *
- *    5) In the current verison, if your platform can't represent
- *       int32_t, int16_t and int8_t, it just dumps out with a compiler
- *       error.
- *
- *    6) 64 bit integers may or may not be defined.  Test for their
- *       presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX.
- *       Note that this is different from the C99 specification which
- *       requires the existence of 64 bit support in the compiler.  If
- *       this is not defined for your platform, yet it is capable of
- *       dealing with 64 bits then it is because this file has not yet
- *       been extended to cover all of your system's capabilities.
- *
- *    7) (u)intptr_t may or may not be defined.  Test for its presence
- *       with the test: #ifdef PTRDIFF_MAX.  If this is not defined
- *       for your platform, then it is because this file has not yet
- *       been extended to cover all of your system's capabilities, not
- *       because its optional.
- *
- *    8) The following might not been defined even if your platform is
- *       capable of defining it:
- *
- *       WCHAR_MIN
- *       WCHAR_MAX
- *       (u)int64_t
- *       PTRDIFF_MIN
- *       PTRDIFF_MAX
- *       (u)intptr_t
- *
- *    9) The following have not been defined:
- *
- *       WINT_MIN
- *       WINT_MAX
- *
- *   10) The criteria for defining (u)int_least(*)_t isn't clear,
- *       except for systems which don't have a type that precisely
- *       defined 8, 16, or 32 bit types (which this include file does
- *       not support anyways). Default definitions have been given.
- *
- *   11) The criteria for defining (u)int_fast(*)_t isn't something I
- *       would trust to any particular compiler vendor or the ANSI C
- *       committee.  It is well known that "compatible systems" are
- *       commonly created that have very different performance
- *       characteristics from the systems they are compatible with,
- *       especially those whose vendors make both the compiler and the
- *       system.  Default definitions have been given, but its strongly
- *       recommended that users never use these definitions for any
- *       reason (they do *NOT* deliver any serious guarantee of
- *       improved performance -- not in this file, nor any vendor's
- *       stdint.h).
- *
- *   12) The following macros:
- *
- *       PRINTF_INTMAX_MODIFIER
- *       PRINTF_INT64_MODIFIER
- *       PRINTF_INT32_MODIFIER
- *       PRINTF_INT16_MODIFIER
- *       PRINTF_LEAST64_MODIFIER
- *       PRINTF_LEAST32_MODIFIER
- *       PRINTF_LEAST16_MODIFIER
- *       PRINTF_INTPTR_MODIFIER
- *
- *       are strings which have been defined as the modifiers required
- *       for the "d", "u" and "x" printf formats to correctly output
- *       (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t,
- *       (u)least32_t, (u)least16_t and (u)intptr_t types respectively.
- *       PRINTF_INTPTR_MODIFIER is not defined for some systems which
- *       provide their own stdint.h.  PRINTF_INT64_MODIFIER is not
- *       defined if INT64_MAX is not defined.  These are an extension
- *       beyond what C99 specifies must be in stdint.h.
- *
- *       In addition, the following macros are defined:
- *
- *       PRINTF_INTMAX_HEX_WIDTH
- *       PRINTF_INT64_HEX_WIDTH
- *       PRINTF_INT32_HEX_WIDTH
- *       PRINTF_INT16_HEX_WIDTH
- *       PRINTF_INT8_HEX_WIDTH
- *       PRINTF_INTMAX_DEC_WIDTH
- *       PRINTF_INT64_DEC_WIDTH
- *       PRINTF_INT32_DEC_WIDTH
- *       PRINTF_INT16_DEC_WIDTH
- *       PRINTF_INT8_DEC_WIDTH
- *
- *       Which specifies the maximum number of characters required to
- *       print the number of that type in either hexadecimal or decimal.
- *       These are an extension beyond what C99 specifies must be in
- *       stdint.h.
- *
- *  Compilers tested (all with 0 warnings at their highest respective
- *  settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32
- *  bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio
- *  .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3
- *
- *  This file should be considered a work in progress.  Suggestions for
- *  improvements, especially those which increase coverage are strongly
- *  encouraged.
- *
- *  Acknowledgements
- *
- *  The following people have made significant contributions to the
- *  development and testing of this file:
- *
- *  Chris Howie
- *  John Steele Scott
- *  Dave Thorup
- *  John Dill
- *
- */
-
-#include <stddef.h>
-#include <limits.h>
-#include <signal.h>
-
-/*
- *  For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and
- *  do nothing else.  On the Mac OS X version of gcc this is _STDINT_H_.
- */
-
-#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined (__UINT_FAST64_TYPE__)) )) && !defined (_PSTDINT_H_INCLUDED)
-#include <stdint.h>
-#define _PSTDINT_H_INCLUDED
-# ifndef PRINTF_INT64_MODIFIER
-#  define PRINTF_INT64_MODIFIER "ll"
-# endif
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-# ifndef PRINTF_INTMAX_MODIFIER
-#  define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
-# endif
-# ifndef PRINTF_INT64_HEX_WIDTH
-#  define PRINTF_INT64_HEX_WIDTH "16"
-# endif
-# ifndef PRINTF_INT32_HEX_WIDTH
-#  define PRINTF_INT32_HEX_WIDTH "8"
-# endif
-# ifndef PRINTF_INT16_HEX_WIDTH
-#  define PRINTF_INT16_HEX_WIDTH "4"
-# endif
-# ifndef PRINTF_INT8_HEX_WIDTH
-#  define PRINTF_INT8_HEX_WIDTH "2"
-# endif
-# ifndef PRINTF_INT64_DEC_WIDTH
-#  define PRINTF_INT64_DEC_WIDTH "20"
-# endif
-# ifndef PRINTF_INT32_DEC_WIDTH
-#  define PRINTF_INT32_DEC_WIDTH "10"
-# endif
-# ifndef PRINTF_INT16_DEC_WIDTH
-#  define PRINTF_INT16_DEC_WIDTH "5"
-# endif
-# ifndef PRINTF_INT8_DEC_WIDTH
-#  define PRINTF_INT8_DEC_WIDTH "3"
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
-# endif
-
-/*
- *  Something really weird is going on with Open Watcom.  Just pull some of
- *  these duplicated definitions from Open Watcom's stdint.h file for now.
- */
-
-# if defined (__WATCOMC__) && __WATCOMC__ >= 1250
-#  if !defined (INT64_C)
-#   define INT64_C(x)   (x + (INT64_MAX - INT64_MAX))
-#  endif
-#  if !defined (UINT64_C)
-#   define UINT64_C(x)  (x + (UINT64_MAX - UINT64_MAX))
-#  endif
-#  if !defined (INT32_C)
-#   define INT32_C(x)   (x + (INT32_MAX - INT32_MAX))
-#  endif
-#  if !defined (UINT32_C)
-#   define UINT32_C(x)  (x + (UINT32_MAX - UINT32_MAX))
-#  endif
-#  if !defined (INT16_C)
-#   define INT16_C(x)   (x)
-#  endif
-#  if !defined (UINT16_C)
-#   define UINT16_C(x)  (x)
-#  endif
-#  if !defined (INT8_C)
-#   define INT8_C(x)   (x)
-#  endif
-#  if !defined (UINT8_C)
-#   define UINT8_C(x)  (x)
-#  endif
-#  if !defined (UINT64_MAX)
-#   define UINT64_MAX  18446744073709551615ULL
-#  endif
-#  if !defined (INT64_MAX)
-#   define INT64_MAX  9223372036854775807LL
-#  endif
-#  if !defined (UINT32_MAX)
-#   define UINT32_MAX  4294967295UL
-#  endif
-#  if !defined (INT32_MAX)
-#   define INT32_MAX  2147483647L
-#  endif
-#  if !defined (INTMAX_MAX)
-#   define INTMAX_MAX INT64_MAX
-#  endif
-#  if !defined (INTMAX_MIN)
-#   define INTMAX_MIN INT64_MIN
-#  endif
-# endif
-#endif
-
-#ifndef _PSTDINT_H_INCLUDED
-#define _PSTDINT_H_INCLUDED
-
-#ifndef SIZE_MAX
-# define SIZE_MAX (~(size_t)0)
-#endif
-
-/*
- *  Deduce the type assignments from limits.h under the assumption that
- *  integer sizes in bits are powers of 2, and follow the ANSI
- *  definitions.
- */
-
-#ifndef UINT8_MAX
-# define UINT8_MAX 0xff
-#endif
-#ifndef uint8_t
-# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S)
-    typedef unsigned char uint8_t;
-#   define UINT8_C(v) ((uint8_t) v)
-# else
-#   error "Platform not supported"
-# endif
-#endif
-
-#ifndef INT8_MAX
-# define INT8_MAX 0x7f
-#endif
-#ifndef INT8_MIN
-# define INT8_MIN INT8_C(0x80)
-#endif
-#ifndef int8_t
-# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S)
-    typedef signed char int8_t;
-#   define INT8_C(v) ((int8_t) v)
-# else
-#   error "Platform not supported"
-# endif
-#endif
-
-#ifndef UINT16_MAX
-# define UINT16_MAX 0xffff
-#endif
-#ifndef uint16_t
-#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S)
-  typedef unsigned int uint16_t;
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER ""
-# endif
-# define UINT16_C(v) ((uint16_t) (v))
-#elif (USHRT_MAX == UINT16_MAX)
-  typedef unsigned short uint16_t;
-# define UINT16_C(v) ((uint16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef INT16_MAX
-# define INT16_MAX 0x7fff
-#endif
-#ifndef INT16_MIN
-# define INT16_MIN INT16_C(0x8000)
-#endif
-#ifndef int16_t
-#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S)
-  typedef signed int int16_t;
-# define INT16_C(v) ((int16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER ""
-# endif
-#elif (SHRT_MAX == INT16_MAX)
-  typedef signed short int16_t;
-# define INT16_C(v) ((int16_t) (v))
-# ifndef PRINTF_INT16_MODIFIER
-#  define PRINTF_INT16_MODIFIER "h"
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef UINT32_MAX
-# define UINT32_MAX (0xffffffffUL)
-#endif
-#ifndef uint32_t
-#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S)
-  typedef unsigned long uint32_t;
-# define UINT32_C(v) v ## UL
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-#elif (UINT_MAX == UINT32_MAX)
-  typedef unsigned int uint32_t;
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-# define UINT32_C(v) v ## U
-#elif (USHRT_MAX == UINT32_MAX)
-  typedef unsigned short uint32_t;
-# define UINT32_C(v) ((unsigned short) (v))
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-#ifndef INT32_MAX
-# define INT32_MAX (0x7fffffffL)
-#endif
-#ifndef INT32_MIN
-# define INT32_MIN INT32_C(0x80000000)
-#endif
-#ifndef int32_t
-#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S)
-  typedef signed long int32_t;
-# define INT32_C(v) v ## L
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER "l"
-# endif
-#elif (INT_MAX == INT32_MAX)
-  typedef signed int int32_t;
-# define INT32_C(v) v
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#elif (SHRT_MAX == INT32_MAX)
-  typedef signed short int32_t;
-# define INT32_C(v) ((short) (v))
-# ifndef PRINTF_INT32_MODIFIER
-#  define PRINTF_INT32_MODIFIER ""
-# endif
-#else
-#error "Platform not supported"
-#endif
-#endif
-
-/*
- *  The macro stdint_int64_defined is temporarily used to record
- *  whether or not 64 integer support is available.  It must be
- *  defined for any 64 integer extensions for new platforms that are
- *  added.
- */
-
-#undef stdint_int64_defined
-#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S)
-# if (__STDC__ && __STDC_VERSION__ >= 199901L) || defined (S_SPLINT_S)
-#  define stdint_int64_defined
-   typedef long long int64_t;
-   typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# endif
-#endif
-
-#if !defined (stdint_int64_defined)
-# if defined(__GNUC__)
-#  define stdint_int64_defined
-   __extension__ typedef long long int64_t;
-   __extension__ typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S)
-#  define stdint_int64_defined
-   typedef long long int64_t;
-   typedef unsigned long long uint64_t;
-#  define UINT64_C(v) v ## ULL
-#  define  INT64_C(v) v ## LL
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "ll"
-#  endif
-# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC)
-#  define stdint_int64_defined
-   typedef __int64 int64_t;
-   typedef unsigned __int64 uint64_t;
-#  define UINT64_C(v) v ## UI64
-#  define  INT64_C(v) v ## I64
-#  ifndef PRINTF_INT64_MODIFIER
-#   define PRINTF_INT64_MODIFIER "I64"
-#  endif
-# endif
-#endif
-
-#if !defined (LONG_LONG_MAX) && defined (INT64_C)
-# define LONG_LONG_MAX INT64_C (9223372036854775807)
-#endif
-#ifndef ULONG_LONG_MAX
-# define ULONG_LONG_MAX UINT64_C (18446744073709551615)
-#endif
-
-#if !defined (INT64_MAX) && defined (INT64_C)
-# define INT64_MAX INT64_C (9223372036854775807)
-#endif
-#if !defined (INT64_MIN) && defined (INT64_C)
-# define INT64_MIN INT64_C (-9223372036854775808)
-#endif
-#if !defined (UINT64_MAX) && defined (INT64_C)
-# define UINT64_MAX UINT64_C (18446744073709551615)
-#endif
-
-/*
- *  Width of hexadecimal for number field.
- */
-
-#ifndef PRINTF_INT64_HEX_WIDTH
-# define PRINTF_INT64_HEX_WIDTH "16"
-#endif
-#ifndef PRINTF_INT32_HEX_WIDTH
-# define PRINTF_INT32_HEX_WIDTH "8"
-#endif
-#ifndef PRINTF_INT16_HEX_WIDTH
-# define PRINTF_INT16_HEX_WIDTH "4"
-#endif
-#ifndef PRINTF_INT8_HEX_WIDTH
-# define PRINTF_INT8_HEX_WIDTH "2"
-#endif
-
-#ifndef PRINTF_INT64_DEC_WIDTH
-# define PRINTF_INT64_DEC_WIDTH "20"
-#endif
-#ifndef PRINTF_INT32_DEC_WIDTH
-# define PRINTF_INT32_DEC_WIDTH "10"
-#endif
-#ifndef PRINTF_INT16_DEC_WIDTH
-# define PRINTF_INT16_DEC_WIDTH "5"
-#endif
-#ifndef PRINTF_INT8_DEC_WIDTH
-# define PRINTF_INT8_DEC_WIDTH "3"
-#endif
-
-/*
- *  Ok, lets not worry about 128 bit integers for now.  Moore's law says
- *  we don't need to worry about that until about 2040 at which point
- *  we'll have bigger things to worry about.
- */
-
-#ifdef stdint_int64_defined
-  typedef int64_t intmax_t;
-  typedef uint64_t uintmax_t;
-# define  INTMAX_MAX   INT64_MAX
-# define  INTMAX_MIN   INT64_MIN
-# define UINTMAX_MAX  UINT64_MAX
-# define UINTMAX_C(v) UINT64_C(v)
-# define  INTMAX_C(v)  INT64_C(v)
-# ifndef PRINTF_INTMAX_MODIFIER
-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH
-# endif
-#else
-  typedef int32_t intmax_t;
-  typedef uint32_t uintmax_t;
-# define  INTMAX_MAX   INT32_MAX
-# define UINTMAX_MAX  UINT32_MAX
-# define UINTMAX_C(v) UINT32_C(v)
-# define  INTMAX_C(v)  INT32_C(v)
-# ifndef PRINTF_INTMAX_MODIFIER
-#   define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER
-# endif
-# ifndef PRINTF_INTMAX_HEX_WIDTH
-#  define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH
-# endif
-# ifndef PRINTF_INTMAX_DEC_WIDTH
-#  define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH
-# endif
-#endif
-
-/*
- *  Because this file currently only supports platforms which have
- *  precise powers of 2 as bit sizes for the default integers, the
- *  least definitions are all trivial.  Its possible that a future
- *  version of this file could have different definitions.
- */
-
-#ifndef stdint_least_defined
-  typedef   int8_t   int_least8_t;
-  typedef  uint8_t  uint_least8_t;
-  typedef  int16_t  int_least16_t;
-  typedef uint16_t uint_least16_t;
-  typedef  int32_t  int_least32_t;
-  typedef uint32_t uint_least32_t;
-# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER
-# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER
-# define  UINT_LEAST8_MAX  UINT8_MAX
-# define   INT_LEAST8_MAX   INT8_MAX
-# define UINT_LEAST16_MAX UINT16_MAX
-# define  INT_LEAST16_MAX  INT16_MAX
-# define UINT_LEAST32_MAX UINT32_MAX
-# define  INT_LEAST32_MAX  INT32_MAX
-# define   INT_LEAST8_MIN   INT8_MIN
-# define  INT_LEAST16_MIN  INT16_MIN
-# define  INT_LEAST32_MIN  INT32_MIN
-# ifdef stdint_int64_defined
-    typedef  int64_t  int_least64_t;
-    typedef uint64_t uint_least64_t;
-#   define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER
-#   define UINT_LEAST64_MAX UINT64_MAX
-#   define  INT_LEAST64_MAX  INT64_MAX
-#   define  INT_LEAST64_MIN  INT64_MIN
-# endif
-#endif
-#undef stdint_least_defined
-
-/*
- *  The ANSI C committee pretending to know or specify anything about
- *  performance is the epitome of misguided arrogance.  The mandate of
- *  this file is to *ONLY* ever support that absolute minimum
- *  definition of the fast integer types, for compatibility purposes.
- *  No extensions, and no attempt to suggest what may or may not be a
- *  faster integer type will ever be made in this file.  Developers are
- *  warned to stay away from these types when using this or any other
- *  stdint.h.
- */
-
-typedef   int_least8_t   int_fast8_t;
-typedef  uint_least8_t  uint_fast8_t;
-typedef  int_least16_t  int_fast16_t;
-typedef uint_least16_t uint_fast16_t;
-typedef  int_least32_t  int_fast32_t;
-typedef uint_least32_t uint_fast32_t;
-#define  UINT_FAST8_MAX  UINT_LEAST8_MAX
-#define   INT_FAST8_MAX   INT_LEAST8_MAX
-#define UINT_FAST16_MAX UINT_LEAST16_MAX
-#define  INT_FAST16_MAX  INT_LEAST16_MAX
-#define UINT_FAST32_MAX UINT_LEAST32_MAX
-#define  INT_FAST32_MAX  INT_LEAST32_MAX
-#define   INT_FAST8_MIN   INT_LEAST8_MIN
-#define  INT_FAST16_MIN  INT_LEAST16_MIN
-#define  INT_FAST32_MIN  INT_LEAST32_MIN
-#ifdef stdint_int64_defined
-  typedef  int_least64_t  int_fast64_t;
-  typedef uint_least64_t uint_fast64_t;
-# define UINT_FAST64_MAX UINT_LEAST64_MAX
-# define  INT_FAST64_MAX  INT_LEAST64_MAX
-# define  INT_FAST64_MIN  INT_LEAST64_MIN
-#endif
-
-#undef stdint_int64_defined
-
-/*
- *  Whatever piecemeal, per compiler thing we can do about the wchar_t
- *  type limits.
- */
-
-#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__)
-# include <wchar.h>
-# ifndef WCHAR_MIN
-#  define WCHAR_MIN 0
-# endif
-# ifndef WCHAR_MAX
-#  define WCHAR_MAX ((wchar_t)-1)
-# endif
-#endif
-
-/*
- *  Whatever piecemeal, per compiler/platform thing we can do about the
- *  (u)intptr_t types and limits.
- */
-
-#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED)
-# define STDINT_H_UINTPTR_T_DEFINED
-#endif
-
-#ifndef STDINT_H_UINTPTR_T_DEFINED
-# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64)
-#  define stdint_intptr_bits 64
-# elif defined (__WATCOMC__) || defined (__TURBOC__)
-#  if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__)
-#    define stdint_intptr_bits 16
-#  else
-#    define stdint_intptr_bits 32
-#  endif
-# elif defined (__i386__) || defined (_WIN32) || defined (WIN32)
-#  define stdint_intptr_bits 32
-# elif defined (__INTEL_COMPILER)
-/* TODO -- what did Intel do about x86-64? */
-# endif
-
-# ifdef stdint_intptr_bits
-#  define stdint_intptr_glue3_i(a,b,c)  a##b##c
-#  define stdint_intptr_glue3(a,b,c)    stdint_intptr_glue3_i(a,b,c)
-#  ifndef PRINTF_INTPTR_MODIFIER
-#    define PRINTF_INTPTR_MODIFIER      stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER)
-#  endif
-#  ifndef PTRDIFF_MAX
-#    define PTRDIFF_MAX                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef PTRDIFF_MIN
-#    define PTRDIFF_MIN                 stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
-#  endif
-#  ifndef UINTPTR_MAX
-#    define UINTPTR_MAX                 stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef INTPTR_MAX
-#    define INTPTR_MAX                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX)
-#  endif
-#  ifndef INTPTR_MIN
-#    define INTPTR_MIN                  stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN)
-#  endif
-#  ifndef INTPTR_C
-#    define INTPTR_C(x)                 stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x)
-#  endif
-#  ifndef UINTPTR_C
-#    define UINTPTR_C(x)                stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x)
-#  endif
-  typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t;
-  typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t)  intptr_t;
-# else
-/* TODO -- This following is likely wrong for some platforms, and does
-   nothing for the definition of uintptr_t. */
-  typedef ptrdiff_t intptr_t;
-# endif
-# define STDINT_H_UINTPTR_T_DEFINED
-#endif
-
-/*
- *  Assumes sig_atomic_t is signed and we have a 2s complement machine.
- */
-
-#ifndef SIG_ATOMIC_MAX
-# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1)
-#endif
-
-#endif
-
-#if defined (__TEST_PSTDINT_FOR_CORRECTNESS)
-
-/* 
- *  Please compile with the maximum warning settings to make sure macros are not
- *  defined more than once.
- */
- 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
- 
-#define glue3_aux(x,y,z) x ## y ## z
-#define glue3(x,y,z) glue3_aux(x,y,z)
-
-#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0);
-#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0);
-
-#define DECL(us,bits) glue3(DECL,us,) (bits)
-
-#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits)
- 
-int main () {
-	DECL(I,8)
-	DECL(U,8)
-	DECL(I,16)
-	DECL(U,16)
-	DECL(I,32)
-	DECL(U,32)
-#ifdef INT64_MAX
-	DECL(I,64)
-	DECL(U,64)
-#endif
-	intmax_t imax = INTMAX_C(0);
-	uintmax_t umax = UINTMAX_C(0);
-	char str0[256], str1[256];
-
-	sprintf (str0, "%d %x\n", 0, ~0);
-	
-	sprintf (str1, "%d %x\n",  i8, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1);
-	sprintf (str1, "%u %x\n",  u8, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1);
-	sprintf (str1, "%d %x\n",  i16, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1);
-	sprintf (str1, "%u %x\n",  u16, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1);	
-	sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n",  i32, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1);
-	sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n",  u32, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1);
-#ifdef INT64_MAX	
-	sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n",  i64, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1);
-#endif
-	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n",  imax, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1);
-	sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n",  umax, ~0);
-	if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1);	
-	
-	TESTUMAX(8);
-	TESTUMAX(16);
-	TESTUMAX(32);
-#ifdef INT64_MAX
-	TESTUMAX(64);
-#endif
-
-	return EXIT_SUCCESS;
-}
-
-#endif

include/regchannel.h

@@ -1,6 +1,6 @@
 /* Modular support
  *
- * (C) 2008-2012 Anope Team
+ * (C) 2008-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -9,7 +9,7 @@
 #ifndef REGCHANNEL_H
 #define REGCHANNEL_H
 
-typedef Anope::insensitive_map<ChannelInfo *> registered_channel_map;
+typedef unordered_map_namespace::unordered_map<Anope::string, ChannelInfo *, ci::hash, std::equal_to<ci::string> > registered_channel_map;
 extern CoreExport registered_channel_map RegisteredChannelList;
 
 /** Flags used for the ChannelInfo class
@@ -18,6 +18,8 @@ enum ChannelInfoFlag
 {
 	CI_BEGIN,
 
+	/* ChanServ is currently holding the channel */
+	CI_INHABIT,
 	/* Retain the topic even after the channel is emptied */
 	CI_KEEPTOPIC,
 	/* Don't allow non-authorized users to be opped */
@@ -32,16 +34,22 @@ enum ChannelInfoFlag
 	CI_PEACE,
 	/* Don't allow any privileges unless a user is IDENTIFIED with NickServ */
 	CI_SECURE,
+	/* Don't allow the channel to be registered or used */
+	CI_FORBIDDEN,
 	/* Channel does not expire */
 	CI_NO_EXPIRE,
 	/* Channel memo limit may not be changed */
 	CI_MEMO_HARDMAX,
+	/* Send notice to channel on use of OP/DEOP */
+	CI_OPNOTICE,
 	/* Stricter control of channel founder status */
 	CI_SECUREFOUNDER,
 	/* Sign kicks with the user who did the kick */
 	CI_SIGNKICK,
 	/* Sign kicks if level is < than the one defined by the SIGNKIGK level */
 	CI_SIGNKICK_LEVEL,
+	/* Uses XOP */
+	CI_XOP,
 	/* Channel is suspended */
 	CI_SUSPENDED,
 	/* Channel still exists when emptied, this can be caused by setting a perm
@@ -55,35 +63,22 @@ enum ChannelInfoFlag
 };
 
 const Anope::string ChannelInfoFlagStrings[] = {
-	"BEGIN", "KEEPTOPIC", "SECUREOPS", "PRIVATE", "TOPICLOCK", "RESTRICTED",
-	"PEACE", "SECURE", "NO_EXPIRE", "MEMO_HARDMAX", "SECUREFOUNDER",
-	"SIGNKICK", "SIGNKICK_LEVEL", "SUSPENDED", "PERSIST", ""
+	"BEGIN", "INHABIT", "KEEPTOPIC", "SECUREOPS", "PRIVATE", "TOPICLOCK", "RESTRICTED",
+	"PEACE", "SECURE", "FORBIDDEN", "NO_EXPIRE", "MEMO_HARDMAX", "OPNOTICE", "SECUREFOUNDER",
+	"SIGNKICK", "SIGNKICK_LEVEL", "XOP", "SUSPENDED", "PERSIST", ""
 };
 
-/** Flags for badwords
- */
-enum BadWordType
+class CoreExport ChanAccess
 {
-	/* Always kicks if the word is said */
-	BW_ANY,
-	/* User must way the entire word */
-	BW_SINGLE,
-	/* The word has to start with the badword */
-	BW_START,
-	/* The word has to end with the badword */
-	BW_END
-};
-
-/* Structure used to contain bad words. */
-struct CoreExport BadWord : Serializable
-{
-	ChannelInfo *ci;
-	Anope::string word;
-	BadWordType type;
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
+	Anope::string mask;	/* Mask of the access entry */
+ public:
+	int16 level;
+	NickCore *nc;		/* NC of the entry, if the entry is a valid nickcore */
+	time_t last_seen;
+	Anope::string creator;
+	
+	ChanAccess(const Anope::string &umask);
+	const Anope::string &GetMask();
 };
 
 /** Flags for auto kick
@@ -97,11 +92,10 @@ enum AutoKickFlag
 const Anope::string AutoKickFlagString[] = { "AK_ISNICK", "" };
 
 /* AutoKick data. */
-class CoreExport AutoKick : public Flags<AutoKickFlag>, public Serializable
+class AutoKick : public Flags<AutoKickFlag>
 {
  public:
- 	AutoKick();
-	ChannelInfo *ci;
+ 	AutoKick() : Flags<AutoKickFlag>(AutoKickFlagString) { }
 	/* Only one of these can be in use */
 	Anope::string mask;
 	NickCore *nc;
@@ -110,61 +104,30 @@ class CoreExport AutoKick : public Flags<AutoKickFlag>, public Serializable
 	Anope::string creator;
 	time_t addtime;
 	time_t last_used;
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
 };
 
-struct CoreExport ModeLock : Serializable
+struct ModeLock
 {
- public:
-	ChannelInfo *ci;
 	bool set;
 	ChannelModeName name;
 	Anope::string param;
 	Anope::string setter;
 	time_t created;
 
-	ModeLock(ChannelInfo *ch, bool s, ChannelModeName n, const Anope::string &p, const Anope::string &se = "", time_t c = Anope::CurTime);
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
+	ModeLock(bool s, ChannelModeName n, const Anope::string &p, const Anope::string &se = "", time_t c = Anope::CurTime) : set(s), name(n), param(p), setter(se), created(c) { }
 };
 
-struct CoreExport LogSetting : Serializable
-{
-	ChannelInfo *ci;
-	/* Our service name of the command */
-	Anope::string service_name;
-	/* The name of the client the command is on */
-	Anope::string command_service;
-	/* Name of the command to the user, can have spaces */
-	Anope::string command_name;
-	Anope::string method, extra;
-	Anope::string creator;
-	time_t created;
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-};
-
-class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, CI_END>, public Serializable
+class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag, CI_END>
 {
  private:
-	NickCore *founder;							/* Channel founder */
-	std::vector<ChanAccess *> access;                                       /* List of authorized users */
+	typedef std::multimap<ChannelModeName, ModeLock> ModeList;
+ private:
+	std::vector<ChanAccess *> access;					/* List of authorized users */
 	std::vector<AutoKick *> akick;						/* List of users to kickban */
 	std::vector<BadWord *> badwords;					/* List of badwords */
-	std::map<Anope::string, int16_t> levels;
+	ModeList mode_locks;
 
  public:
-	typedef std::multimap<ChannelModeName, ModeLock> ModeList;
-	ModeList mode_locks;
-	std::vector<LogSetting> log_settings;
-
  	/** Default constructor
 	 * @param chname The channel name
 	 */
@@ -173,13 +136,14 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	/** Copy constructor
 	 * @param ci The ChannelInfo to copy settings to
 	 */
-	ChannelInfo(ChannelInfo &ci);
+	ChannelInfo(ChannelInfo *ci);
 
 	/** Default destructor
 	 */
 	~ChannelInfo();
 
 	Anope::string name; /* Channel name */
+	NickCore *founder;
 	NickCore *successor; /* Who gets the channel if the founder nick is dropped or expires */
 	Anope::string desc;
 
@@ -190,44 +154,38 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	Anope::string last_topic_setter;	/* Setter */
 	time_t last_topic_time;			/* Time */
 
-	int16_t bantype;
+	// These two should be using extensible
+	Anope::string forbidby;
+	Anope::string forbidreason;
+
+	int16 bantype;
+	int16 *levels; /* Access levels for commands */
 
 	MemoInfo memos;
 
 	Channel *c; /* Pointer to channel record (if channel is currently in use) */
 
 	/* For BotServ */
+
 	BotInfo *bi;					/* Bot used on this channel */
 	Flags<BotServFlag> botflags;
-	int16_t ttb[TTB_SIZE];			/* Times to ban for each kicker */
+	int16 *ttb;						/* Times to ban for each kicker */
 
-	int16_t capsmin, capspercent;	/* For CAPS kicker */
-	int16_t floodlines, floodsecs;	/* For FLOOD kicker */
-	int16_t repeattimes;			/* For REPEAT kicker */
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
-	/** Change the founder of the channek
-	 * @params nc The new founder
-	 */
-	void SetFounder(NickCore *nc);
-
-	/** Get the founder of the channel
-	 * @return The founder
-	 */
-	NickCore *GetFounder() const;
-
-	/** Find which bot should send mode/topic/etc changes for this channel
-	 * @return The bot
-	 */
-	BotInfo *WhoSends();
+	int16 capsmin, capspercent;		/* For CAPS kicker */
+	int16 floodlines, floodsecs;	/* For FLOOD kicker */
+	int16 repeattimes;				/* For REPEAT kicker */
 
 	/** Add an entry to the channel access list
-	 * @param access The entry
+	 *
+	 * @param mask The mask of the access entry
+	 * @param level The channel access level the user has on the channel
+	 * @param creator The user who added the access
+	 * @param last_seen When the user was last seen within the channel
+	 * @return The new access class
+	 *
+	 * Creates a new access list entry and inserts it into the access list.
 	 */
-	void AddAccess(ChanAccess *access);
+	ChanAccess *AddAccess(const Anope::string &mask, int16 level, const Anope::string &creator, int32 last_seen = 0);
 
 	/** Get an entry from the channel access list by index
 	 *
@@ -238,11 +196,36 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	 */
 	ChanAccess *GetAccess(unsigned index);
 
-	/** Retrieve the access for a user or group in the form of a vector of access entries
-	 * (as multiple entries can affect a single user).
+	/** Get an entry from the channel access list by User
+	 *
+	 * @param u The User to find within the access list vector
+	 * @param level Optional channel access level to compare the access entries to
+	 * @return A ChanAccess struct corresponding to the User, or NULL if not found
+	 *
+	 * Retrieves an entry from the access list that matches the given User, optionally also matching a certain level.
 	 */
-	AccessGroup AccessFor(User *u);
-	AccessGroup AccessFor(NickCore *nc);
+	ChanAccess *GetAccess(User *u, int16 level = 0);
+
+	/** Get an entry from the channel access list by NickCore
+	 *
+	 * @param u The NickCore to find within the access list vector
+	 * @param level Optional channel access level to compare the access entries to
+	 * @return A ChanAccess struct corresponding to the NickCore, or NULL if not found
+	 *
+	 * Retrieves an entry from the access list that matches the given NickCore, optionally also matching a certain level.
+	 */
+	ChanAccess *GetAccess(NickCore *nc, int16 level = 0);
+	
+	/** Get an entry from the channel access list by mask
+	 *
+	 * @param u The mask to find within the access list vector
+	 * @param level Optional channel access level to compare the access entries to
+	 * @param wildcard True to match using wildcards
+	 * @return A ChanAccess struct corresponding to the mask, or NULL if not found
+	 *
+	 * Retrieves an entry from the access list that matches the given mask, optionally also matching a certain level.
+	 */
+	ChanAccess *GetAccess(const Anope::string &mask, int16 level = 0, bool wildcard = true);
 
 	/** Get the size of the accss vector for this channel
 	 * @return The access vector size
@@ -336,6 +319,11 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	 */
 	void ClearBadWords();
 
+	/** Loads MLocked modes from extensible. This is used from database loading because Anope doesn't know what modes exist
+	 * until after it connects to the IRCd.
+	 */
+	void LoadMLock();
+
 	/** Check if a mode is mlocked
 	 * @param mode The mode
 	 * @param An optional param
@@ -383,12 +371,6 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	 */
 	ModeLock *GetMLock(ChannelModeName mname, const Anope::string &param = "");
 
-	/** Get the current mode locks as a string
-	 * @param complete True to show mlock parameters aswell
-	 * @return A string of mode locks, eg: +nrt
-	 */
-	Anope::string GetMLockAsString(bool complete) const;
-
 	/** Check whether a user is permitted to be on this channel
 	 * @param u The user
 	 * @return true if they are allowed, false if they aren't and were kicked
@@ -400,39 +382,17 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	 * the new topic in the ChannelInfo
 	 */
 	void CheckTopic();
-
+	
 	/** Restore the channel topic, used on channel creation when not syncing with the uplink
 	 * and after uplink sync
 	 */
 	void RestoreTopic();
-
-	/** Get the level for a privilege
-	 * @param priv The privilege name
-	 * @return the level
-	 * @throws CoreException if priv is not a valid privilege
-	 */
-	int16_t GetLevel(const Anope::string &priv);
-
-	/** Set the level for a privilege
-	 * @param priv The privilege priv
-	 * @param level The new level
-	 */
-	void SetLevel(const Anope::string &priv, int16_t level);
-
-	/** Remove a privilege from the channel
-	 * @param priv The privilege
-	 */
-	void RemoveLevel(const Anope::string &priv);
-
-	/** Clear all privileges from the channel
-	 */
-	void ClearLevels();
 };
 
 /** A timer used to keep the BotServ bot/ChanServ in the channel
  * after kicking the last user in a channel
  */
-class CoreExport ChanServTimer : public Timer
+class ChanServTimer : public Timer
 {
  private:
 	dynamic_reference<Channel> c;

include/serialize.h

@@ -1,159 +0,0 @@
-#ifndef SERIALIZE_H
-#define SERIALIZE_H
-
-namespace Serialize
-{
- 	enum DataType
-	{
-		DT_TEXT,
-		DT_INT
-	};
-
-	class stringstream : public std::stringstream
-	{
-	 private:
-		DataType type;
-		bool key;
-		unsigned _max;
-
-	 public:
-		stringstream() : std::stringstream(), type(DT_TEXT), key(false), _max(0) { }
-		stringstream(const stringstream &ss) : std::stringstream(ss.str()), type(DT_TEXT), key(false), _max(0) { }
-		Anope::string astr() const { return this->str(); }
-		template<typename T> std::istream &operator>>(T &val)
-		{
-			std::istringstream is(this->str());
-			is >> val;
-			return *this;
-		}
-		std::istream &operator>>(Anope::string &val)
-		{
-			val = this->str();
-			return *this;
-		}
-		stringstream &setType(DataType t)
-		{
-			this->type = t;
-			return *this;
-		}
-		DataType getType() const
-		{
-			return this->type;
-		}
-		stringstream &setKey()
-		{
-			this->key = true;
-			return *this;
-		}
-		bool getKey() const
-		{
-			return this->key;
-		}
-		stringstream &setMax(unsigned m)
-		{
-			this->_max = m;
-			return *this;
-		}
-		unsigned getMax() const
-		{
-			return this->_max;
-		}
-	};
-}
-
-extern void RegisterTypes();
-
-class CoreExport Serializable
-{
- private:
-	static std::list<Serializable *> *serizliable_items;
-
-	std::list<Serializable *>::iterator s_iter;
-
- protected:
-	Serializable()
-	{
-		if (serizliable_items == NULL)
-			serizliable_items = new std::list<Serializable *>();
-		serizliable_items->push_front(this);
-		this->s_iter = serizliable_items->begin();
-	}
-
-	Serializable(const Serializable &)
-	{
-		serizliable_items->push_front(this);
-		this->s_iter = serizliable_items->begin();
-	}
-
-	virtual ~Serializable()
-	{
-		serizliable_items->erase(this->s_iter);
-	}
-
-	Serializable &operator=(const Serializable &)
-	{
-		return *this;
-	}
-
- public:
-	typedef std::map<Anope::string, Serialize::stringstream> serialized_data;
-
-	virtual Anope::string serialize_name() const = 0;
-	virtual serialized_data serialize() = 0;
-
-	static const std::list<Serializable *> &GetItems()
-	{
-		return *serizliable_items;
-	}
-};
-
-class CoreExport SerializeType
-{
-	typedef void (*unserialize_func)(Serializable::serialized_data &);
-
-	static std::vector<Anope::string> type_order;
-	static Anope::map<SerializeType *> types;
-
-	Anope::string name;
-	unserialize_func unserialize;
-
- public:
-	SerializeType(const Anope::string &n, unserialize_func f) : name(n), unserialize(f)
-	{
-		type_order.push_back(this->name);
-		types[this->name] = this;
-	}
-
-	~SerializeType()
-	{
-		std::vector<Anope::string>::iterator it = std::find(type_order.begin(), type_order.end(), this->name);
-		if (it != type_order.end())
-			type_order.erase(it);
-		types.erase(this->name);
-	}
-
-	const Anope::string &GetName()
-	{
-		return this->name;
-	}
-
-	void Create(Serializable::serialized_data &data)
-	{
-		this->unserialize(data);
-	}
-
-	static SerializeType *Find(const Anope::string &name)
-	{
-		Anope::map<SerializeType *>::iterator it = types.find(name);
-		if (it != types.end())
-			return it->second;
-		return NULL;
-	}
-
-	static const std::vector<Anope::string> &GetTypeOrder()
-	{
-		return type_order;
-	}
-};
-
-#endif // SERIALIZE_H

include/servers.h

@@ -6,10 +6,32 @@ extern CoreExport Server *Me;
 
 extern CoreExport void do_server(const Anope::string &source, const Anope::string &servername, unsigned int hops, const Anope::string &descript, const Anope::string &numeric);
 
-extern CoreExport const Anope::string ts6_uid_retrieve();
-extern CoreExport const Anope::string ts6_sid_retrieve();
+extern CoreExport const char *ts6_uid_retrieve();
+extern CoreExport const char *ts6_sid_retrieve();
 
-extern CoreExport std::set<Anope::string> Capab;
+/* Types of capab
+ */
+enum CapabType
+{
+	CAPAB_BEGIN,
+
+	CAPAB_NOQUIT,
+	CAPAB_TSMODE,
+	CAPAB_UNCONNECT,
+	CAPAB_QS,
+
+	CAPAB_END
+};
+
+/* CAPAB stuffs */
+struct CapabInfo
+{
+	Anope::string Token;
+	CapabType Flag;
+};
+
+extern CoreExport Flags<CapabType, CAPAB_END> Capab;
+extern CoreExport CapabInfo Capab_Info[];
 
 /** Flags set on servers
  */
@@ -85,11 +107,6 @@ class CoreExport Server : public Flags<ServerFlag>
 	 */
 	const Anope::string &GetDescription() const;
 
-	/** Change this servers SID
-	 * @param sid The new SID
-	 */
-	void SetSID(const Anope::string &sid);
-
 	/** Get the server numeric/SID
 	 * @return The numeric/SID
 	 */
@@ -130,12 +147,6 @@ class CoreExport Server : public Flags<ServerFlag>
 	 */
 	bool IsULined() const;
 
-	/** Send a message to alll users on this server
-	 * @param source The source of the message
-	 * @param message The message
-	 */
-	void Notice(BotInfo *source, const Anope::string &message);
-
 	/** Find a server
 	 * @param name The name or SID/numeric
 	 * @param s The server list to search for this server on, defaults to our Uplink

include/services.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -20,16 +20,19 @@
 
 #define BUFSIZE 1024
 
+/* Some SUN fixs */
+#ifdef __sun
+# ifndef INADDR_NONE
+#  define INADDR_NONE (-1)
+# endif
+#endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdexcept>
 #include <string.h>
 
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-
 #include <signal.h>
 #include <time.h>
 #include <errno.h>
@@ -39,12 +42,13 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <typeinfo>
-#include <ctype.h>
 
 #if GETTEXT_FOUND
 # include <libintl.h>
+# define _(x) anope_gettext(x)
+#else
+# define _(x) x
 #endif
-#define _(x) x
 
 #ifndef _WIN32
 # include <unistd.h>
@@ -54,12 +58,14 @@
 # include <arpa/inet.h>
 # include <sys/socket.h>
 # include <sys/time.h>
-# include <sys/wait.h>
 # include <dirent.h>
-# include <pthread.h>
+# ifdef HAVE_BACKTRACE
+#  include <execinfo.h>
+# endif
 # define DllExport
 # define CoreExport
 # define MARK_DEPRECATED __attribute((deprecated))
+# define DeleteFile unlink
 #else
 # include "anope_windows.h"
 #endif
@@ -71,6 +77,33 @@
 # define FORMAT(type, fmt, start)
 #endif
 
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+
+#ifdef _AIX
+/* Some AIX boxes seem to have bogus includes that don't have these
+ * prototypes. */
+extern int strcasecmp(const char *, const char *);
+extern int strncasecmp(const char *, const char *, size_t);
+# undef FD_ZERO
+# define FD_ZERO(p) memset((p), 0, sizeof(*(p)))
+#endif /* _AIX */
+
+/* Alias stricmp/strnicmp to strcasecmp/strncasecmp if we have the latter
+ * but not the former. */
+#if !HAVE_STRICMP && HAVE_STRCASECMP
+# define stricmp strcasecmp
+# define strnicmp strncasecmp
+#endif
+
+/* We have our own versions of toupper()/tolower(). */
+#include <ctype.h>
+#undef tolower
+#undef toupper
+#define tolower tolower_
+#define toupper toupper_
+
 /** This definition is used as shorthand for the various classes
  * and functions needed to make a module loadable by the OS.
  * It defines the class factory and external AnopeInit and AnopeFini functions.
@@ -84,6 +117,12 @@
 	} \
 	BOOLEAN WINAPI DllMain(HINSTANCE, DWORD nReason, LPVOID) \
 	{ \
+		switch (nReason) \
+		{ \
+			case DLL_PROCESS_ATTACH: \
+			case DLL_PROCESS_DETACH: \
+				break; \
+		} \
 		return TRUE; \
 	} \
 	extern "C" DllExport void AnopeFini(x *); \
@@ -191,6 +230,20 @@ class ModuleException : public CoreException
 	virtual ~ModuleException() throw() { }
 };
 
+class DatabaseException : public CoreException
+{
+ public:
+	/** This constructor can be used to specify an error message before throwing.
+	 * @param mmessage The exception
+	 */
+	DatabaseException(const Anope::string &message) : CoreException(message, "A database module") { }
+
+	/** Destructor
+	 * @throws Nothing
+	 */
+	virtual ~DatabaseException() throw() { }
+};
+
 /** Debug cast to be used instead of dynamic_cast, this uses dynamic_cast
  * for debug builds and static_cast on releass builds to speed up the program
  * because dynamic_cast relies on RTTI.
@@ -219,7 +272,6 @@ template<typename T, size_t Size = 32> class Flags
 	const Anope::string *Flag_Strings;
 
  public:
-	Flags() : Flag_Strings(NULL) { }
  	Flags(const Anope::string *flag_strings) : Flag_Strings(flag_strings) { }
 
 	/** Add a flag to this item
@@ -262,29 +314,7 @@ template<typename T, size_t Size = 32> class Flags
 		Flag_Values.reset();
 	}
 
-	Anope::string ToString()
-	{
-		std::vector<Anope::string> v = ToVector();
-		Anope::string flag_buf;
-		for (unsigned i = 0; i < v.size(); ++i)
-			flag_buf += v[i] + " ";
-		flag_buf.trim();
-		return flag_buf;
-	}
-
-	void FromString(const Anope::string &str)
-	{
-		spacesepstream sep(str);
-		Anope::string buf;
-		std::vector<Anope::string> v;
-
-		while (sep.GetToken(buf))
-			v.push_back(buf);
-
-		FromVector(v);
-	}
-
-	std::vector<Anope::string> ToVector()
+	std::vector<Anope::string> ToString()
 	{
 		std::vector<Anope::string> ret;
 		for (unsigned i = 0; this->Flag_Strings && !this->Flag_Strings[i].empty(); ++i)
@@ -293,10 +323,8 @@ template<typename T, size_t Size = 32> class Flags
 		return ret;
 	}
 
-	void FromVector(const std::vector<Anope::string> &strings)
+	void FromString(const std::vector<Anope::string> &strings)
 	{
-		this->ClearFlags();
-
 		for (unsigned i = 0; this->Flag_Strings && !this->Flag_Strings[i].empty(); ++i)
 			for (unsigned j = 0; j < strings.size(); ++j)
 				if (this->Flag_Strings[i] == strings[j])
@@ -304,66 +332,6 @@ template<typename T, size_t Size = 32> class Flags
 	}
 };
 
-class Module;
-
-class CoreExport Service : public Base
-{
-	static Anope::map<Anope::map<Service *> > services;
- public:
- 	static Service *FindService(const Anope::string &t, const Anope::string &n)
-	{
-		Anope::map<Anope::map<Service *> >::iterator it = services.find(t);
-		if (it != services.end())
-		{
-			Anope::map<Service *>::iterator it2 = it->second.find(n);
-			if (it2 != it->second.end())
-				return it2->second;
-		}
-
-		return NULL;
-	}
-
-	static std::vector<Anope::string> GetServiceKeys(const Anope::string &t)
-	{
-		std::vector<Anope::string> keys;
-		Anope::map<Anope::map<Service *> >::iterator it = services.find(t);
-		if (it != services.end())
-			for (Anope::map<Service *>::iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2)
-				keys.push_back(it2->first);
-		return keys;
-	}
-
-	Module *owner;
-	Anope::string type;
-	Anope::string name;
-
-	Service(Module *o, const Anope::string &t, const Anope::string &n) : owner(o), type(t), name(n)
-	{
-		this->Register();
-	}
-
-	virtual ~Service()
-	{
-		this->Unregister();
-	}
-
-	void Register()
-	{
-		Anope::map<Service *> &smap = services[this->type];
-		if (smap.find(this->name) != smap.end())
-			throw ModuleException("Service " + this->type + " with name " + this->name + " already exists");
-		smap[this->name] = this;
-	}
-
-	void Unregister()
-	{
-		Anope::map<Service *> &smap = services[this->type];
-		smap.erase(this->name);
-		if (smap.empty())
-			services.erase(this->type);
-	}
-};
-
 #include "sockets.h"
 #include "socketengine.h"
 #include "extensible.h"
@@ -372,21 +340,6 @@ class CoreExport Service : public Base
 
 /*************************************************************************/
 
-class Signal : public Pipe
-{
-	static std::vector<Signal *> SignalHandlers;
-	static void SignalHandler(int signal);
-
-	struct sigaction action, old;
- public:
-	int signal;
-
-	Signal(int s);
-	~Signal();
-
-	virtual void OnNotify() = 0;
-};
-
 class ConvertException : public CoreException
 {
  public:
@@ -456,11 +409,11 @@ class ChannelInfo;
 class Channel;
 class Server;
 class Entry;
+struct Session;
 
 #include "threadengine.h"
 #include "opertype.h"
 #include "modes.h"
-#include "serialize.h"
 
 /*************************************************************************/
 
@@ -501,25 +454,21 @@ enum MemoFlag
 	/* Memo is unread */
 	MF_UNREAD,
 	/* Sender requests a receipt */
-	MF_RECEIPT
+	MF_RECEIPT,
+	/* Memo is a notification of receipt */
+	MF_NOTIFYS
 };
 
 const Anope::string MemoFlagStrings[] = {
-	"MF_UNREAD", "MF_RECEIPT", ""
+	"MF_UNREAD", "MF_RECEIPT", "MF_NOTIFYS", ""
 };
 
 /* Memo info structures.  Since both nicknames and channels can have memos,
  * we encapsulate memo data in a MemoList to make it easier to handle. */
-class CoreExport Memo : public Flags<MemoFlag>, public Serializable
+class CoreExport Memo : public Flags<MemoFlag>
 {
  public:
- 	Memo();
-
-	Anope::string serialize_name() const;
-	serialized_data serialize();
-	static void unserialize(serialized_data &);
-
-	Anope::string owner;
+	Memo();
 	time_t time;	/* When it was sent */
 	Anope::string sender;
 	Anope::string text;
@@ -527,9 +476,9 @@ class CoreExport Memo : public Flags<MemoFlag>, public Serializable
 
 struct CoreExport MemoInfo
 {
-	int16_t memomax;
+	int16 memomax;
 	std::vector<Memo *> memos;
-	std::vector<Anope::string> ignores;
+	std::vector<ci::string> ignores;
 
 	unsigned GetIndex(Memo *m) const;
 	void Del(unsigned index);
@@ -537,15 +486,6 @@ struct CoreExport MemoInfo
 	bool HasIgnore(User *u);
 };
 
-struct Session
-{
-	Anope::string host;		/* Host of the session */
-	unsigned count;			/* Number of clients with this host */
-	unsigned hits;			/* Number of subsequent kills for a host */
-};
-
-struct Exception;
-
 /*************************************************************************/
 
 class CoreExport HostInfo
@@ -592,7 +532,95 @@ class CoreExport HostInfo
 	/** Retrieve when the vhost was crated
 	 * @return the time it was created
 	 */
-	time_t GetTime() const;
+	const time_t GetTime() const;
+};
+
+enum AccessLevel
+{
+	/* Note that these two levels also serve as exclusive boundaries for valid
+	 * access levels.  ACCESS_FOUNDER may be assumed to be strictly greater
+	 * than any valid access level, and ACCESS_INVALID may be assumed to be
+	 * strictly less than any valid access level. Also read below.
+	 */
+	ACCESS_FOUNDER = 10001, /* Numeric level indicating founder access */
+	ACCESS_INVALID = -10000, /* Used in levels[] for disabled settings */
+	/* There is one exception to the above access levels: SuperAdmins will have
+	 * access level 10001. This level is never stored, however; it is only used
+	 * in comparison and to let SuperAdmins win from founders where needed
+	 */
+	ACCESS_SUPERADMIN = 10002,
+	/* Levels for xOP */
+	ACCESS_VOP = 3,
+	ACCESS_HOP = 4,
+	ACCESS_AOP = 5,
+	ACCESS_SOP = 10,
+	ACCESS_QOP = 10000
+};
+
+/** Flags for badwords
+ */
+enum BadWordType
+{
+	/* Always kicks if the word is said */
+	BW_ANY,
+	/* User must way the entire word */
+	BW_SINGLE,
+	/* The word has to start with the badword */
+	BW_START,
+	/* The word has to end with the badword */
+	BW_END
+};
+
+/* Structure used to contain bad words. */
+struct BadWord
+{
+	Anope::string word;
+	BadWordType type;
+};
+
+/* Indices for cmd_access[]: */
+enum ChannelAccess
+{
+	CA_INVITE,
+	CA_AKICK,
+	CA_SET,			/* but not FOUNDER or PASSWORD */
+	CA_UNBAN,
+	CA_AUTOOP,
+	CA_AUTOVOICE,
+	CA_OPDEOP,		/* ChanServ commands OP and DEOP */
+	CA_ACCESS_LIST,
+	CA_NOJOIN,		/* Maximum */
+	CA_ACCESS_CHANGE,
+	CA_MEMO,
+	CA_ASSIGN,		/* BotServ ASSIGN command */
+	CA_BADWORDS,	/* BotServ BADWORDS command */
+	CA_NOKICK,		/* Not kicked by the bot */
+	CA_FANTASIA,
+	CA_SAY,
+	CA_GREET,
+	CA_VOICEME,
+	CA_VOICE,
+	CA_GETKEY,
+	CA_AUTOHALFOP,
+	CA_AUTOPROTECT,
+	CA_OPDEOPME,
+	CA_HALFOPME,
+	CA_HALFOP,
+	CA_PROTECTME,
+	CA_PROTECT,
+	CA_KICKME,
+	CA_KICK,
+	CA_SIGNKICK,
+	CA_BANME,
+	CA_BAN,
+	CA_TOPIC,
+	CA_MODE,
+	CA_INFO,
+	CA_AUTOOWNER,
+	CA_OWNER,
+	CA_OWNERME,
+	CA_FOUNDER,
+	CA_SIZE
 };
 
 /* BotServ SET flags */
@@ -605,6 +633,8 @@ enum BotServFlag
 	BS_DONTKICKVOICES,
 	/* BotServ bot accepts fantasy commands */
 	BS_FANTASY,
+	/* BotServ bot sets modes etc instead of ChanServ */
+	BS_SYMBIOSIS,
 	/* BotServ should show greets */
 	BS_GREET,
 	/* BotServ bots are not allowed to be in this channel */
@@ -629,11 +659,17 @@ enum BotServFlag
 	BS_KICK_ITALICS,
 	/* BotServ kicks for amsgs */
 	BS_KICK_AMSGS,
+	/* Send fantasy replies back to the channel via PRIVMSG */
+	BS_MSG_PRIVMSG,
+	/* Send fantasy replies back to the channel via NOTICE */
+	BS_MSG_NOTICE,
+	/* Send fantasy replies back to the channel via NOTICE to ops */
+	BS_MSG_NOTICEOPS,
 	BS_END
 };
 
 const Anope::string BotServFlagStrings[] = {
-	"BEGIN", "DONTKICKOPS", "DONTKICKVOICES", "FANTASY", "GREET", "NOBOT",
+	"BEGIN", "DONTKICKOPS", "DONTKICKVOICES", "FANTASY", "SYMBIOSIS", "GREET", "NOBOT",
 	"KICK_BOLDs", "KICK_COLORS", "KICK_REVERSES", "KICK_UNDERLINES", "KICK_BADWORDS", "KICK_CAPS",
 	"KICK_FLOOD", "KICK_REPEAT", "KICK_ITALICS", "KICK_AMSGS", "MSG_PRIVMSG", "MSG_NOTICE",
 	"MSG_NOTICEOPS", ""
@@ -655,7 +691,6 @@ enum
 	TTB_SIZE
 };
 
-#include "access.h"
 #include "regchannel.h"
 
 /*************************************************************************/
@@ -666,8 +701,22 @@ enum
 
 #include "users.h"
 #include "account.h"
-#include "commands.h"
 #include "bots.h"
+
+struct BanData
+{
+	Anope::string mask;	/* Since a nick is unsure and a User structure is unsafe */
+	time_t last_use;	/* Since time is the only way to check whether it's still useful */
+	int16 ttb[TTB_SIZE];
+};
+
+struct LevelInfo
+{
+	int what;
+	Anope::string name;
+	const char *desc;
+};
+
 #include "channels.h"
 
 /** Channelban type flags
@@ -714,6 +763,33 @@ class CoreExport Entry : public Flags<EntryType>
 
 /*************************************************************************/
 
+/* News stuff */
+
+enum NewsType
+{
+	NEWS_LOGON,
+	NEWS_RANDOM,
+	NEWS_OPER
+};
+
+struct NewsMessages
+{
+	NewsType type;
+	Anope::string name;
+	const char *msgs[10];
+};
+
+struct NewsItem
+{
+	NewsType type;
+	uint32 num;
+	Anope::string Text;
+	Anope::string who;
+	time_t time;
+};
+
+/*************************************************************************/
+
 /* Mail data */
 
 struct MailInfo
@@ -725,7 +801,43 @@ struct MailInfo
 
 /*************************************************************************/
 
+struct Exception
+{
+	Anope::string mask;		/* Hosts to which this exception applies */
+	unsigned limit;				/* Session limit for exception */
+	Anope::string who;		/* Nick of person who added the exception */
+	Anope::string reason;	/* Reason for exception's addition */
+	time_t time;			/* When this exception was added */
+	time_t expires;			/* Time when it expires. 0 == no expiry */
+};
+
+/*************************************************************************/
+
+extern CoreExport Anope::map<Session *> SessionList;
+
+struct Session
+{
+	Anope::string host;
+	unsigned count;	/* Number of clients with this host */
+	unsigned hits;	/* Number of subsequent kills for a host */
+};
+
+/*************************************************************************/
+
 /* Defcon */
+enum DefconLevel
+{
+	DEFCON_NO_NEW_CHANNELS,
+	DEFCON_NO_NEW_NICKS,
+	DEFCON_NO_MLOCK_CHANGE,
+	DEFCON_FORCE_CHAN_MODES,
+	DEFCON_REDUCE_SESSION,
+	DEFCON_NO_NEW_CLIENTS,
+	DEFCON_OPER_ONLY,
+	DEFCON_SILENT_OPER_ONLY,
+	DEFCON_AKILL_NEW_CLIENTS,
+	DEFCON_NO_NEW_MEMOS
+};
 
 /*************************************************************************/
 
@@ -748,10 +860,10 @@ class IRCdMessage;
 struct Uplink;
 class ServerConfig;
 class ConfigurationFile;
-class XLine;
 
 #include "extern.h"
 #include "language.h"
+#include "operserv.h"
 #include "mail.h"
 #include "servers.h"
 #include "logger.h"
@@ -764,6 +876,7 @@ class CoreExport IRCDProto
 	virtual void SendModeInternal(const BotInfo *, const Channel *, const Anope::string &) = 0;
 	virtual void SendModeInternal(const BotInfo *, const User *, const Anope::string &) = 0;
 	virtual void SendKickInternal(const BotInfo *, const Channel *, const User *, const Anope::string &) = 0;
+	virtual void SendNoticeChanopsInternal(const BotInfo *bi, const Channel *, const Anope::string &) = 0;
 	virtual void SendMessageInternal(const BotInfo *bi, const Anope::string &dest, const Anope::string &buf);
 	virtual void SendNoticeInternal(const BotInfo *bi, const Anope::string &dest, const Anope::string &msg);
 	virtual void SendPrivmsgInternal(const BotInfo *bi, const Anope::string &dest, const Anope::string &buf);
@@ -775,7 +888,7 @@ class CoreExport IRCDProto
  public:
 	virtual ~IRCDProto() { }
 
-	virtual void SendSVSNOOP(const Server *, bool) { }
+	virtual void SendSVSNOOP(const Anope::string &, int) { }
 	virtual void SendTopic(BotInfo *, Channel *) = 0;
 	virtual void SendVhostDel(User *) { }
 	virtual void SendAkill(User *, const XLine *) = 0;
@@ -783,8 +896,9 @@ class CoreExport IRCDProto
 	virtual void SendSVSKill(const BotInfo *source, const User *user, const char *fmt, ...);
 	virtual void SendMode(const BotInfo *bi, const Channel *dest, const char *fmt, ...);
 	virtual void SendMode(const BotInfo *bi, const User *u, const char *fmt, ...);
-	virtual void SendClientIntroduction(const User *u) = 0;
+	virtual void SendClientIntroduction(const User *u, const Anope::string &) = 0;
 	virtual void SendKick(const BotInfo *bi, const Channel *chan, const User *user, const char *fmt, ...);
+	virtual void SendNoticeChanops(const BotInfo *bi, const Channel *dest, const char *fmt, ...);
 	virtual void SendMessage(const BotInfo *bi, const Anope::string &dest, const char *fmt, ...);
 	virtual void SendNotice(const BotInfo *bi, const Anope::string &dest, const char *fmt, ...);
 	virtual void SendAction(const BotInfo *bi, const Anope::string &dest, const char *fmt, ...);
@@ -795,13 +909,13 @@ class CoreExport IRCDProto
 	virtual void SendQuit(const User *u, const char *fmt, ...);
 	virtual void SendPing(const Anope::string &servname, const Anope::string &who);
 	virtual void SendPong(const Anope::string &servname, const Anope::string &who);
-	virtual void SendJoin(User *, Channel *, const ChannelStatus *) = 0;
+	virtual void SendJoin(BotInfo *, Channel *, const ChannelStatus *) = 0;
 	virtual void SendSQLineDel(const XLine *x) { }
 	virtual void SendInvite(const BotInfo *bi, const Anope::string &chan, const Anope::string &nick);
 	virtual void SendPart(const BotInfo *bi, const Channel *chan, const char *fmt, ...);
 	virtual void SendGlobops(const BotInfo *source, const char *fmt, ...);
 	virtual void SendSQLine(User *, const XLine *x) { }
-	virtual void SendSquit(Server *, const Anope::string &message);
+	virtual void SendSquit(const Anope::string &servname, const Anope::string &message);
 	virtual void SendSVSO(const Anope::string &, const Anope::string &, const Anope::string &) { }
 	virtual void SendChangeBotNick(const BotInfo *bi, const Anope::string &newnick);
 	virtual void SendForceNickChange(const User *u, const Anope::string &newnick, time_t when);
@@ -813,6 +927,7 @@ class CoreExport IRCDProto
 	virtual void SendSZLineDel(const XLine *) { }
 	virtual void SendSZLine(User *u, const XLine *) { }
 	virtual void SendSGLine(User *, const XLine *) { }
+	virtual void SendUnregisteredNick(const User *) { }
 	virtual void SendCTCP(const BotInfo *bi, const Anope::string &dest, const char *fmt, ...);
 	virtual void SendSVSJoin(const Anope::string &, const Anope::string &, const Anope::string &, const Anope::string &) { }
 	virtual void SendSWhois(const Anope::string &, const Anope::string &, const Anope::string &) { }
@@ -822,8 +937,23 @@ class CoreExport IRCDProto
 	virtual bool IsNickValid(const Anope::string &) { return true; }
 	virtual bool IsChannelValid(const Anope::string &);
 	virtual void SendNumeric(const Anope::string &source, int numeric, const Anope::string &dest, const char *fmt, ...);
-	virtual void SendLogin(User *u) = 0;
-	virtual void SendLogout(User *u) = 0;
+
+	/** Sends a message logging a user into an account, where ircds support such a feature.
+	 * @param u The user logging in
+	 * @param account The account the user is logging into
+	 */
+	virtual void SendAccountLogin(const User *u, const NickCore *account) { }
+
+	/** Sends a message logging a user out of an account, where ircds support such a feature.
+	 * @param u The user logging out
+	 * @param account The account the user is logging out of
+	 */
+	virtual void SendAccountLogout(const User *u, const NickCore *account) { }
+
+	/** Set a users auto identification token
+	 * @param u The user
+	 */
+	virtual void SetAutoIdentificationToken(User *u) { }
 
 	/** Send a channel creation message to the uplink.
 	 * On most TS6 IRCds this is a SJOIN with no nick
@@ -865,19 +995,6 @@ struct Uplink
 	bool ipv6;
 
 	Uplink(const Anope::string &_host, int _port, const Anope::string &_password, bool _ipv6) : host(_host), port(_port), password(_password), ipv6(_ipv6) { }
-	bool operator==(const Uplink &other) const
-	{
-		if (this->host != other.host)
-			return false;
-		if (this->port != other.port)
-			return false;
-		if (this->password != other.password)
-			return false;
-		if (this->ipv6 != other.ipv6)
-			return false;
-		return true;
-	}
-	inline bool operator!=(const Uplink &other) const { return !(*this == other); }
 };
 
 /** A class to process numbered lists (passed to most DEL/LIST/VIEW commands).
@@ -924,29 +1041,4 @@ class CoreExport NumberList
 	virtual bool InvalidRange(const Anope::string &list);
 };
 
-class CoreExport ListFormatter
-{
- public:
- 	typedef std::map<Anope::string, Anope::string> ListEntry;
- private:
-	std::vector<Anope::string> columns;
-	std::vector<ListEntry> entries;
- public:
-	ListFormatter &addColumn(const Anope::string &name);
-	void addEntry(const ListEntry &entry);
-	bool isEmpty() const;
-	void Process(std::vector<Anope::string> &);
-};
-
-class CoreExport InfoFormatter
-{
-	User *user;
-	std::vector<std::pair<Anope::string, Anope::string> > replies;
-	unsigned longest;
- public:
-	InfoFormatter(User *u);
-	void Process(std::vector<Anope::string> &);
-	Anope::string &operator[](const Anope::string &key);
-};
-
 #endif /* SERVICES_H */

include/socketengine.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -12,43 +12,47 @@
 #ifndef SOCKETENGINE_H
 #define SOCKETENGINE_H
 
-class CoreExport SocketEngine
+class CoreExport SocketEngineBase
 {
  public:
+#ifdef _WIN32
+	/* Windows crap */
+	WSADATA wsa;
+#endif
 	/* Map of sockets */
-	static std::map<int, Socket *> Sockets;
+	std::map<int, Socket *> Sockets;
 
-	/** Called to initialize the socket engine
+	/** Default constructor
 	 */
-	static void Init();
+	SocketEngineBase();
 
-	/** Called to shutdown the socket engine
+	/** Default destructor
 	 */
-	static void Shutdown();
+	virtual ~SocketEngineBase();
 
 	/** Add a socket to the internal list
 	 * @param s The socket
 	 */
-	static void AddSocket(Socket *s);
+	virtual void AddSocket(Socket *s) { }
 
 	/** Delete a socket from the internal list
 	 * @param s The socket
 	 */
-	static void DelSocket(Socket *s);
+	virtual void DelSocket(Socket *s) { }
 
 	/** Mark a socket as writeable
 	 * @param s The socket
 	 */
-	static void MarkWritable(Socket *s);
+	virtual void MarkWritable(Socket *s) { }
 
 	/** Unmark a socket as writeable
 	 * @param s The socket
 	 */
-	static void ClearWritable(Socket *s);
+	virtual void ClearWritable(Socket *s) { }
 
 	/** Read from sockets and do things
 	 */
-	static void Process();
+	virtual void Process() { }
 };
 
 #endif // SOCKETENGINE_H

include/sockets.h

@@ -1,6 +1,6 @@
 /*
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -16,6 +16,12 @@
 
 #define NET_BUFSIZE 65535
 
+#ifdef _WIN32
+# define CloseSocket closesocket
+#else
+# define CloseSocket close
+#endif
+
 /** A sockaddr union used to combine IPv4 and IPv6 sockaddrs
  */
 union CoreExport sockaddrs
@@ -100,17 +106,22 @@ class SocketException : public CoreException
 	virtual ~SocketException() throw() { }
 };
 
+enum SocketType
+{
+	SOCKTYPE_BASE,
+	SOCKTYPE_BUFFERED,
+	SOCKTYPE_CONNECTION,
+	SOCKTYPE_CLIENT,
+	SOCKTYPE_LISTEN
+};
+
 enum SocketFlag
 {
 	SF_DEAD,
-	SF_WRITABLE,
-	SF_CONNECTING,
-	SF_CONNECTED,
-	SF_ACCEPTING,
-	SF_ACCEPTED
+	SF_WRITABLE
 };
 
-static const Anope::string SocketFlagStrings[] = { "SF_DEAD", "SF_WRITABLE", "SF_CONNECTING", "SF_CONNECTED", "SF_ACCEPTING", "SF_ACCEPTED", "" };
+static const Anope::string SocketFlagStrings[] = { "SF_DEAD", "SF_WRITABLE", "" };
 
 class Socket;
 class ClientSocket;
@@ -126,54 +137,34 @@ class CoreExport SocketIO
 	 * @param sz How much to read
 	 * @return Number of bytes received
 	 */
-	virtual int Recv(Socket *s, char *buf, size_t sz);
+	virtual int Recv(Socket *s, char *buf, size_t sz) const;
 
 	/** Write something to the socket
-	 * @param s The socket
-	 * @param buf The data to write
-	 * @param size The length of the data
+ 	 * @param s The socket
+	 * @param buf What to write
+	 * @return Number of bytes written
 	 */
-	virtual int Send(Socket *s, const char *buf, size_t sz);
-	int Send(Socket *s, const Anope::string &buf);
+	virtual int Send(Socket *s, const Anope::string &buf) const;
 
 	/** Accept a connection from a socket
 	 * @param s The socket
-	 * @return The new socket
 	 */
-	virtual ClientSocket *Accept(ListenSocket *s);
-
-	/** Finished accepting a connection from a socket
-	 * @param s The socket
-	 * @return SF_ACCEPTED if accepted, SF_ACCEPTING if still in process, SF_DEAD on error
-	 */
-	virtual SocketFlag FinishAccept(ClientSocket *cs);
-
-	/** Bind a socket
-	 * @param s The socket
-	 * @param ip The IP to bind to
-	 * @param port The optional port to bind to
-	 */
-	virtual void Bind(Socket *s, const Anope::string &ip, int port = 0);
+	virtual void Accept(ListenSocket *s);
 
 	/** Connect the socket
-	 * @param s The socket
+	 * @param s THe socket
 	 * @param target IP to connect to
 	 * @param port to connect to
+	 * @param bindip IP to bind to, if any
 	 */
-	virtual void Connect(ConnectionSocket *s, const Anope::string &target, int port);
-
-	/** Called to potentially finish a pending connection
-	 * @param s The socket
-	 * @return SF_CONNECTED on success, SF_CONNECTING if still pending, and SF_DEAD on error.
-	 */
-	virtual SocketFlag FinishConnect(ConnectionSocket *s);
+	virtual void Connect(ConnectionSocket *s, const Anope::string &target, int port, const Anope::string &bindip = "");
 
 	/** Called when the socket is destructing
 	 */
 	virtual void Destroy() { }
 };
 
-class CoreExport Socket : public Flags<SocketFlag>
+class CoreExport Socket : public Flags<SocketFlag, 2>
 {
  protected:
 	/* Socket FD */
@@ -182,22 +173,22 @@ class CoreExport Socket : public Flags<SocketFlag>
 	bool IPv6;
 
  public:
-	/* Sockaddrs for bind() (if it's bound) */
-	sockaddrs bindaddr;
-
 	/* I/O functions used for this socket */
  	SocketIO *IO;
 
-	/** Empty constructor, should not be called.
+	/* Type this socket is */
+	SocketType Type;
+
+	/** Empty constructor, used for things such as the pipe socket
 	 */
 	Socket();
 
 	/** Default constructor
-	 * @param sock The socket to use, -1 if we need to create our own
+	 * @param sock The socket to use, 0 if we need to create our own
 	 * @param ipv6 true if using ipv6
 	 * @param type The socket type, defaults to SOCK_STREAM
 	 */
- 	Socket(int sock, bool ipv6 = false, int type = SOCK_STREAM);
+ 	Socket(int sock, bool ipv6, int type = SOCK_STREAM);
 
 	/** Default destructor
 	 */
@@ -223,17 +214,6 @@ class CoreExport Socket : public Flags<SocketFlag>
 	 */
 	bool SetNonBlocking();
 
-	/** Bind the socket to an ip and port
-	 * @param ip The ip
-	 * @param port The port
-	 */
-	void Bind(const Anope::string &ip, int port = 0);
-
-	/** Called when there either is a read or write event.
-	 * @return true to continue to call ProcessRead/ProcessWrite, false to not continue
-	 */
-	virtual bool Process();
-
 	/** Called when there is something to be received for this socket
 	 * @return true on success, false to drop this socket
 	 */
@@ -250,21 +230,28 @@ class CoreExport Socket : public Flags<SocketFlag>
 	virtual void ProcessError();
 };
 
-class CoreExport BufferedSocket : public virtual Socket
+class CoreExport BufferedSocket : public Socket
 {
  protected:
 	/* Things to be written to the socket */
-	Anope::string WriteBuffer;
+	std::string WriteBuffer;
 	/* Part of a message sent from the server, but not totally received */
-	Anope::string extrabuf;
+	std::string extrabuf;
 	/* How much data was received from this socket */
-	int RecvLen;
+	size_t RecvLen;
 
  public:
-	/** Constructor
+	/** Blank constructor
 	 */
 	BufferedSocket();
 
+	/** Constructor
+	 * @param fd FD to use
+	 * @param ipv6 true for ipv6
+	 * @param type socket type, defaults to SOCK_STREAM
+	 */
+	BufferedSocket(int fd, bool ipv6, int type = SOCK_STREAM);
+
 	/** Default destructor
 	 */
 	virtual ~BufferedSocket();
@@ -294,62 +281,20 @@ class CoreExport BufferedSocket : public virtual Socket
 	/** Get the length of the read buffer
 	 * @return The length of the read buffer
 	 */
-	int ReadBufferLen() const;
+	size_t ReadBufferLen() const;
 
 	/** Get the length of the write buffer
 	 * @return The length of the write buffer
 	 */
-	int WriteBufferLen() const;
-};
-
-class CoreExport BinarySocket : public virtual Socket
-{
-	struct DataBlock
-	{
-		char *buf;
-		size_t len;
-
-		DataBlock(const char *b, size_t l);
-		~DataBlock();
-	};
-
-	std::deque<DataBlock *> WriteBuffer;
-
- public:
-	/** Constructor
-	 */
-	BinarySocket();
-
-	/** Default destructor
-	 */
-	virtual ~BinarySocket();
-
-	/** Called when there is something to be received for this socket
-	 * @return true on success, false to drop this socket
-	 */
-	bool ProcessRead();
-
-	/** Called when the socket is ready to be written to
-	 * @return true on success, false to drop this socket
-	 */
-	bool ProcessWrite();
-
-	/** Write data to the socket
-	 * @param buffer The data to write
-	 * @param l The length of the data
-	 */
-	void Write(const char *buffer, size_t l);
-
-	/** Called with data from the socket
-	 * @param buffer The data
-	 * @param l The length of buffer
-	 * @return true to continue reading, false to drop the socket
-	 */
-	virtual bool Read(const char *buffer, size_t l);
+	size_t WriteBufferLen() const;
 };
 
 class CoreExport ListenSocket : public Socket
 {
+ protected:
+	/* Sockaddrs for bindip/port */
+	sockaddrs listenaddrs;
+
  public:
 	/** Constructor
 	 * @param bindip The IP to bind to
@@ -372,47 +317,32 @@ class CoreExport ListenSocket : public Socket
  	 * @param addr The sockaddr for where the connection came from
 	 * @return The new socket
 	 */
-	virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr) = 0;
+	virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr);
 };
 
-class CoreExport ConnectionSocket : public virtual Socket
+class CoreExport ConnectionSocket : public BufferedSocket
 {
  public:
+	/* Sockaddrs for bindip (if there is one) */
+	sockaddrs bindaddr;
 	/* Sockaddrs for connection ip/port */
 	sockaddrs conaddr;
 
 	/** Constructor
+	 * @param ipv6 true to use IPv6
+	 * @param type The socket type, defaults to SOCK_STREAM
 	 */
-	ConnectionSocket();
+	ConnectionSocket(bool ipv6 = false, int type = SOCK_STREAM);
 
 	/** Connect the socket
 	 * @param TargetHost The target host to connect to
 	 * @param Port The target port to connect to
+	 * @param BindHost The host to bind to for connecting
 	 */
-	void Connect(const Anope::string &TargetHost, int Port);
-
-	/** Called when there either is a read or write event.
-	 * Used to determine whether or not this socket is connected yet.
-	 * @return true to continue to call ProcessRead/ProcessWrite, false to not continue
-	 */
-	bool Process();
-
-	/** Called when there is an error for this socket
-	 * @return true on success, false to drop this socket
-	 */
-	void ProcessError();
-
-	/** Called on a successful connect
-	 */
-	virtual void OnConnect();
-
-	/** Called when a connection is not successful
-	 * @param error The error
-	 */
-	virtual void OnError(const Anope::string &error);
+	void Connect(const Anope::string &TargetHost, int Port, const Anope::string &BindHost = "");
 };
 
-class CoreExport ClientSocket : public virtual Socket
+class CoreExport ClientSocket : public BufferedSocket
 {
  public:
 	/* Listen socket this connection came from */
@@ -422,31 +352,13 @@ class CoreExport ClientSocket : public virtual Socket
 
 	/** Constructor
 	 * @param ls Listen socket this connection is from
+	 * @param fd New FD for this socket
 	 * @param addr Address the connection came from
 	 */
-	ClientSocket(ListenSocket *ls, const sockaddrs &addr);
-
-	/** Called when there either is a read or write event.
-	 * Used to determine whether or not this socket is connected yet.
-	 * @return true to continue to call ProcessRead/ProcessWrite, false to not continue
-	 */
-	bool Process();
-
-	/** Called when there is an error for this socket
-	 * @return true on success, false to drop this socket
-	 */
-	void ProcessError();
-
-	/** Called when a client has been accepted() successfully.
-	 */
-	virtual void OnAccept();
-
-	/** Called when there was an error accepting the client
-	 */
-	virtual void OnError(const Anope::string &error);
+	ClientSocket(ListenSocket *ls, int fd, const sockaddrs &addr);
 };
 
-class CoreExport Pipe : public Socket
+class CoreExport Pipe : public BufferedSocket
 {
  public:
  	/** The FD of the write pipe (if this isn't evenfd)
@@ -458,14 +370,14 @@ class CoreExport Pipe : public Socket
 	 */
 	Pipe();
 
-	/** Destructor
-	 */
-	~Pipe();
-
 	/** Called when data is to be read
 	 */
 	bool ProcessRead();
 
+	/** Function that calls OnNotify
+	 */
+	bool Read(const Anope::string &);
+
 	/** Called when this pipe needs to be woken up
 	 */
 	void Notify();

include/sysconf.h.cmake

@@ -4,33 +4,102 @@
 #cmakedefine DEBUG_BUILD
 
 #cmakedefine DEFUMASK @DEFUMASK@
-#cmakedefine HAVE_CSTDINT 1
+#cmakedefine HAVE_SYS_TYPES_H 1
 #cmakedefine HAVE_STDINT_H 1
 #cmakedefine HAVE_STDDEF_H 1
+#cmakedefine HAVE_BACKTRACE 1
 #cmakedefine HAVE_SETGRENT 1
 #cmakedefine HAVE_STRCASECMP 1
 #cmakedefine HAVE_STRICMP 1
 #cmakedefine HAVE_STRINGS_H 1
+#cmakedefine HAVE_STRLCAT 1
+#cmakedefine HAVE_STRLCPY 1
 #cmakedefine HAVE_UMASK 1
 #cmakedefine HAVE_EVENTFD 1
-#cmakedefine HAVE_EPOLL 1
-#cmakedefine HAVE_POLL 1
 #cmakedefine GETTEXT_FOUND 1
 #cmakedefine RUNGROUP "@RUNGROUP@"
 
-#ifdef HAVE_CSTDINT
-# include <cstdint>
-#else
-# ifdef HAVE_STDINT_H
-#  include <stdint.h>
-# else
-#  include "pstdint.h"
-# endif
+#cmakedefine HAVE_UINT8_T 1
+#cmakedefine HAVE_U_INT8_T 1
+#cmakedefine HAVE_INT16_T 1
+#cmakedefine HAVE_UINT16_T 1
+#cmakedefine HAVE_U_INT16_T 1
+#cmakedefine HAVE_INT32_T 1
+#cmakedefine HAVE_UINT32_T 1
+#cmakedefine HAVE_U_INT32_T 1
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
 #endif
 #ifdef HAVE_STDDEF_H
 # include <stddef.h>
 #endif
 
+#ifdef HAVE_UINT8_T
+typedef uint8_t uint8;
+#else
+# ifdef HAVE_U_INT8_T
+typedef u_int8_t uint8;
+# else
+#  ifdef _WIN32
+typedef unsigned __int8 uint8;
+#  else
+typedef unsigned short uint8;
+#  endif
+# endif
+#endif
+
+#ifdef HAVE_INT16_T
+typedef int16_t int16;
+#else
+# ifdef _WIN32
+typedef signed __int16 int16;
+# else
+typedef int int16;
+# endif
+#endif
+
+#ifdef HAVE_UINT16_T
+typedef uint16_t uint16;
+#else
+# ifdef HAVE_U_INT16_T
+typedef u_int16_t uint16;
+# else
+#  ifdef _WIN32
+typedef unsigned __int16 uint16;
+#  else
+typedef unsigned int uint16;
+#  endif
+# endif
+#endif
+
+#ifdef HAVE_INT32_T
+typedef int32_t int32;
+#else
+# ifdef _WIN32
+typedef signed __int32 int32;
+# else
+typedef long int32;
+# endif
+#endif
+
+#ifdef HAVE_UINT32_T
+typedef uint32_t uint32;
+#else
+# ifdef HAVE_U_INT32_T
+typedef u_int32_t uint32;
+# else
+#  ifdef _WIN32
+typedef unsigned __int32 uint32;
+#  else
+typedef unsigned long uint32;
+#  endif
+# endif
+#endif
+
 #ifdef _WIN32
 # define popen _popen
 # define pclose _pclose

include/threadengine.h

@@ -1,9 +1,47 @@
 #ifndef THREADENGINE_H
 #define THREADENGINE_H
 
+#ifdef _WIN32
+typedef HANDLE ThreadHandle;
+typedef CRITICAL_SECTION MutexHandle;
+typedef HANDLE CondHandle;
+#else
+# include <pthread.h>
+typedef pthread_t ThreadHandle;
+typedef pthread_mutex_t MutexHandle;
+typedef pthread_cond_t CondHandle;
+#endif
+
+class ThreadEngine;
 class Thread;
 
-class CoreExport Thread : public Pipe, public Extensible
+extern CoreExport ThreadEngine threadEngine;
+
+class CoreExport ThreadEngine
+{
+ public:
+	/* Vector of threads */
+	std::vector<Thread *> threads;
+
+	/** Threadengines constructor
+	 */
+	ThreadEngine();
+
+	/** Threadengines destructor
+	 */
+	~ThreadEngine();
+
+	/** Start a new thread
+	 * @param thread A pointer to a newley allocated thread
+	 */
+	void Start(Thread *thread);
+
+	/** Check for finished threads
+	 */
+	void Process();
+};
+
+class CoreExport Thread : public Extensible
 {
  private:
 	/* Set to true to tell the thread to finish and we are waiting for it */
@@ -11,7 +49,7 @@ class CoreExport Thread : public Pipe, public Extensible
 
  public:
 	/* Handle for this thread */
-	pthread_t Handle;
+	ThreadHandle Handle;
 
 	/** Threads constructor
 	 */
@@ -33,29 +71,21 @@ class CoreExport Thread : public Pipe, public Extensible
 	 */
 	void Exit();
 
-	/** Launch the thread
-	 */
-	void Start();
-
 	/** Returns the exit state of the thread
 	 * @return true if we want to exit
 	 */
 	bool GetExitState() const;
 
-	/** Called when this thread should be joined to
+	/** Called to run the thread, should be overloaded
 	 */
-	void OnNotify();
-
-	/** Called when the thread is run.
-	 */
-	virtual void Run() = 0;
+	virtual void Run();
 };
 
 class CoreExport Mutex
 {
  protected:
 	/* A mutex, used to keep threads in sync */
-	pthread_mutex_t mutex;
+	MutexHandle mutex;
 
  public:
 	/** Constructor
@@ -85,7 +115,7 @@ class CoreExport Condition : public Mutex
 {
  private:
 	/* A condition */
-	pthread_cond_t cond;
+	CondHandle cond;
 
  public:
 	/** Constructor

include/timers.h

@@ -1,6 +1,6 @@
 /* Timer include stuff.
  *
- * (C) 2003-2012 Anope Team
+ * (C) 2003-2011 Anope Team
  * Contact us at team@anope.org
  *
  * Please read COPYING and README for further details.
@@ -63,11 +63,6 @@ class CoreExport Timer : public Extensible
 	 */
 	bool GetRepeat() const;
 
-	/** Set the interval between ticks
-	 * @paramt t The new interval
-	 */
-	void SetSecs(time_t t);
-
 	/** Returns the interval between ticks
 	 * @return The interval
 	 */
@@ -90,6 +85,7 @@ class CoreExport Timer : public Extensible
  */
 class CoreExport TimerManager : public Extensible
 {
+ protected:
 	/** A list of timers
 	 */
 	static std::vector<Timer *> Timers;

include/users.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2011 Robin Burchell <w00t@inspircd.org>
- * Copyright (C) 2008-2012 Anope Team <team@anope.org>
+ * Copyright (C) 2008-2011 Anope Team <team@anope.org>
  *
  * Please read COPYING and README for further details.
  */
@@ -54,7 +54,8 @@ class CoreExport User : public Extensible
 	Server *server;			/* Server user is connected to */
 	time_t timestamp;		/* Timestamp of the nick */
 	time_t my_signon;		/* When did _we_ see the user? */
-	bool SuperAdmin;		/* is SuperAdmin on or off? */
+
+	int isSuperAdmin;		/* is SuperAdmin on or off? */
 
 	/* Channels the user is in */
 	UChannelList chans;
@@ -76,7 +77,7 @@ class CoreExport User : public Extensible
 	 * @param shost The hostname of the user
 	 * @param suid The unique identifier of the user.
 	 */
-	User(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &suid = "");
+	User(const Anope::string &snick, const Anope::string &sident, const Anope::string &shost, const Anope::string &suid);
 
 	/** Destroy a user.
 	 */
@@ -194,7 +195,7 @@ class CoreExport User : public Extensible
 	 * @param CheckSecure Only returns true if the user has secure off
 	 * @return true or false
 	 */
-	virtual bool IsRecognized(bool CheckSecure = true);
+	virtual bool IsRecognized(bool CheckSecure = false);
 
 	/** Check if the user is a services oper
 	 * @return true if they are an oper
@@ -271,11 +272,6 @@ class CoreExport User : public Extensible
 	 */
 	void SetModesInternal(const char *umodes, ...);
 
-	/** Get modes set for this user.
-	 * @return A string of modes set on the user
-	 */
-	Anope::string GetModes() const;
-
 	/** Find the channel container for Channel c that the user is on
 	 * This is preferred over using FindUser in Channel, as there are usually more users in a channel
 	 * than channels a user is in
@@ -288,12 +284,6 @@ class CoreExport User : public Extensible
 	 * @return true or false
 	 */
 	bool IsProtected() const;
-
-	/** Kill a user
-	 * @param source The user/server doing the kill
-	 * @param reason The reason for the kill
-	 */
-	void Kill(const Anope::string &source, const Anope::string &reason);
 };
 
 #endif // USERS_H

include/version.cpp

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

language/update.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-rm -f anope.pot
+rm anope.pot
 touch anope.pot
 
 cd ..
-FILES=`find ./ -name *.cpp -o -name *.h | grep -v /modules/third/`
+FILES=`find ./ -name *.cpp -o -name *.h | grep -v /modules/extra/`
 for f in $FILES
 do
-	xgettext -E -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $f
+	xgettext -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword=_ $f
 done
 
 cd -

modules/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_subdirectory("third/language")
+add_subdirectory("extra/language")
 
 # Get a list of ALL files and directories within the current directory
 file(GLOB MODULES_FOLDERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
@@ -77,16 +77,11 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
             set(WIN32_NO_LIBS)
           endif(WIN32)
           set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${TEMP_LDFLAGS} ${WIN32_NO_LIBS}")
-          add_dependencies(${SO} ${PROGRAM_NAME})
-          if(GETTEXT_FOUND)
-            add_dependencies(${SO} module_language)
-          endif(GETTEXT_FOUND)
+          add_dependencies(${SO} ${PROGRAM_NAME} module_language)
           # For Windows only, have the module link to the export library of Anope as well as wsock32 and Ws2_32 libraries (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
           if(WIN32)
             target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY} ${TEMP_DEPENDENCIES})
             set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}")
-          else(WIN32)
-            target_link_libraries(${SO} ${PROGRAM_NAME} ${TEMP_DEPENDENCIES})
           endif(WIN32)
           # Set the module to be installed to the module directory under the data directory
           install(TARGETS ${SO}
@@ -101,7 +96,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
     # Get a list of ALL files and directories within this modules directory
     file(GLOB SUBMODULE_DIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${MODULE_FOLDER}/*")
     remove_item_from_list(SUBMODULE_DIRS "CMakeFiles")
-    remove_item_from_list(SUBMODULE_DIRS "third/language")
+    remove_item_from_list(SUBMODULE_DIRS "extra/language")
 
     foreach(SUBDIR ${SUBMODULE_DIRS})
       if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}")
@@ -179,10 +174,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
           # Generate the module and set it's linker flags, also set it to depend on the main Anope executable to be built beforehand
           add_library(${SO} MODULE ${MODULES_SUBDIR_SRCS})
           set_target_properties(${SO} PROPERTIES LINKER_LANGUAGE CXX PREFIX "" SUFFIX "" LINK_FLAGS "${SUBDIR_LDFLAGS}")
-          add_dependencies(${SO} ${PROGRAM_NAME})
-          if(GETTEXT_FOUND)
-            add_dependencies(${SO} module_language)
-          endif(GETTEXT_FOUND)
+          add_dependencies(${SO} ${PROGRAM_NAME} module_language)
           # For Windows only, have the module link to the export library of Anope as well as wsock32 and Ws2_32 libraries (most of the modules probably don't need this, but this is to be on the safe side), also set it's version
           if(WIN32)
              target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY} ${SUBDIR_EXTRA_DEPENDS})

modules/commands/bs_assign.cpp

@@ -1,166 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSAssign : public Command
-{
- public:
-	CommandBSAssign(Module *creator) : Command(creator, "botserv/assign", 2, 2)
-	{
-		this->SetDesc(_("Assigns a bot to a channel"));
-		this->SetSyntax(_("\037channel\037 \037nick\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-		const Anope::string &nick = params[1];
-
-		User *u = source.u;
-
-		if (readonly)
-		{
-			source.Reply(BOT_ASSIGN_READONLY);
-			return;
-		}
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		BotInfo *bi = findbot(nick);
-		if (!bi)
-		{
-			source.Reply(BOT_DOES_NOT_EXIST, nick.c_str());
-			return;
-		}
-
- 		if (ci->botflags.HasFlag(BS_NOBOT) || (!ci->AccessFor(u).HasPriv("ASSIGN") && !u->HasPriv("botserv/administration")))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (bi->HasFlag(BI_PRIVATE) && !u->HasCommand("botserv/assign/private"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (ci->bi == bi)
-		{
-			source.Reply(_("Bot \002%s\002 is already assigned to channel \002%s\002."), ci->bi->nick.c_str(), chan.c_str());
-			return;
-		}
-
-		bool override = !ci->AccessFor(u).HasPriv("ASSIGN");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << bi->nick;
-
-		bi->Assign(u, ci);
-		source.Reply(_("Bot \002%s\002 has been assigned to %s."), bi->nick.c_str(), ci->name.c_str());
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Assigns a bot pointed out by nick to the channel chan. You\n"
-				"can then configure the bot for the channel so it fits\n"
-				"your needs."));
-		return true;
-	}
-};
-
-class CommandBSUnassign : public Command
-{
- public:
-	CommandBSUnassign(Module *creator) : Command(creator, "botserv/unassign", 1, 1)
-	{
-		this->SetDesc(_("Unassigns a bot from a channel"));
-		this->SetSyntax(_("\037channel\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		if (readonly)
-		{
-			source.Reply(BOT_ASSIGN_READONLY);
-			return;
-		}
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (!u->HasPriv("botserv/administration") && !ci->AccessFor(u).HasPriv("ASSIGN"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (!ci->bi)
-		{
-			source.Reply(BOT_NOT_ASSIGNED);
-			return;
-		}
-
-		if (ci->HasFlag(CI_PERSIST) && !ModeManager::FindChannelModeByName(CMODE_PERM))
-		{
-			source.Reply(_("You can not unassign bots while persist is set on the channel."));
-			return;
-		}
-
-		bool override = !ci->AccessFor(u).HasPriv("ASSIGN");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << ci->bi->nick;
-
-		ci->bi->UnAssign(u, ci);
-		source.Reply(_("There is no bot assigned to %s anymore."), ci->name.c_str());
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Unassigns a bot from a channel. When you use this command,\n"
-				"the bot won't join the channel anymore. However, bot\n"
-				"configuration for the channel is kept, so you will always\n"
-				"be able to reassign a bot later without have to reconfigure\n"
-				"it entirely."));
-		return true;
-	}
-};
-
-class BSAssign : public Module
-{
-	CommandBSAssign commandbsassign;
-	CommandBSUnassign commandbsunassign;
-
- public:
-	BSAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbsassign(this), commandbsunassign(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(BSAssign)

modules/commands/bs_control.cpp

@@ -1,156 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSSay : public Command
-{
- public:
-	CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2)
-	{
-		this->SetDesc(_("Makes the bot say the given text on the given channel"));
-		this->SetSyntax(_("\037channel\037 \037text\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &text = params[1];
-
-		User *u = source.u;
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (!ci->AccessFor(u).HasPriv("SAY"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (!ci->bi)
-		{
-			source.Reply(BOT_NOT_ASSIGNED);
-			return;
-		}
-
-		if (!ci->c || !ci->c->FindUser(ci->bi))
-		{
-			source.Reply(BOT_NOT_ON_CHANNEL, ci->name.c_str());
-			return;
-		}
-
-		if (text[0] == '\001')
-		{
-			this->OnSyntaxError(source, "");
-			return;
-		}
-
-		ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text.c_str());
-		ci->bi->lastmsg = Anope::CurTime;
-
-		// XXX need a way to find if someone is overriding this
-		Log(LOG_COMMAND, u, this, ci) << text;
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Makes the bot say the given text on the given channel."));
-		return true;
-	}
-};
-
-class CommandBSAct : public Command
-{
- public:
-	CommandBSAct(Module *creator) : Command(creator, "botserv/act", 2, 2)
-	{
-		this->SetDesc(_("Makes the bot do the equivalent of a \"/me\" command"));
-		this->SetSyntax(_("\037channel\037 \037text\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		Anope::string message = params[1];
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (!ci->AccessFor(u).HasPriv("SAY"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (!ci->bi)
-		{
-			source.Reply(BOT_NOT_ASSIGNED);
-			return;
-		}
-
-		if (!ci->c || !ci->c->FindUser(ci->bi))
-		{
-			source.Reply(BOT_NOT_ON_CHANNEL, ci->name.c_str());
-			return;
-		}
-
-		size_t i = 0;
-		while ((i = message.find(1)) && i != Anope::string::npos)
-			message.erase(i, 1);
-
-		ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str());
-		ci->bi->lastmsg = Anope::CurTime;
-
-		// XXX Need to be able to find if someone is overriding this.
-		Log(LOG_COMMAND, u, this, ci) << message;
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Makes the bot do the equivalent of a \"/me\" command\n"
-				"on the given channel using the given text."));
-		return true;
-	}
-};
-
-class BSControl : public Module
-{
-	CommandBSSay commandbssay;
-	CommandBSAct commandbsact;
-
- public:
-	BSControl(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbssay(this), commandbsact(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(BSControl)

modules/commands/bs_info.cpp

@@ -1,250 +0,0 @@
-/* BotServ core functions
- *
- * (C) 2003-2012 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.
- *
- *
- */
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandBSInfo : public Command
-{
- private:
-	void send_bot_channels(std::vector<Anope::string> &buffers, BotInfo *bi)
-	{
-		Anope::string buf;
-		for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it)
-		{
-			ChannelInfo *ci = it->second;
-
-			if (ci->bi == bi)
-			{
-				buf += " " + ci->name + " ";
-				if (buf.length() > 300)
-				{
-					buffers.push_back(buf);
-					buf.clear();
-				}
-			}
-		}
-		if (!buf.empty())
-			buffers.push_back(buf);
-	}
-
-	void CheckOptStr(Anope::string &buf, BotServFlag flag, const char *option, Flags<BotServFlag> &flags, NickCore *nc)
-	{
-		if (flags.HasFlag(flag))
-		{
-			if (!buf.empty())
-				buf += ", ";
-			buf += translate(nc, option);
-		}
-	}
-
- public:
-	CommandBSInfo(Module *creator) : Command(creator, "botserv/info", 1, 1)
-	{
-		this->SetDesc(_("Allows you to see BotServ information about a channel or a bot"));
-		this->SetSyntax(_("\002INFO {\037chan\037 | \037nick\037}\002"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &query = params[0];
-
-		User *u = source.u;
-		BotInfo *bi = findbot(query);
-		ChannelInfo *ci;
-		InfoFormatter info(u);
-
-		if (bi)
-		{
-			source.Reply(_("Information for bot \002%s\002:"), bi->nick.c_str());
-			info[_("Mask")] = bi->GetIdent() + "@" + bi->host;
-			info[_("Real name")] = bi->realname;
-			info[_("Created")] = do_strftime(bi->created);
-			info[_("Options")] = bi->HasFlag(BI_PRIVATE) ? _("Private") : _("None");
-			info[_("Used on")] = stringify(bi->chancount) + " channel(s)";
-
-			std::vector<Anope::string> replies;
-			info.Process(replies);
-
-			for (unsigned i = 0; i < replies.size(); ++i)
-				source.Reply(replies[i]);
-
-			if (u->HasPriv("botserv/administration"))
-			{
-				std::vector<Anope::string> buf;
-				this->send_bot_channels(buf, bi);
-				for (unsigned i = 0; i < buf.size(); ++i)
-					source.Reply(buf[i]);
-			}
-
-		}
-		else if ((ci = cs_findchan(query)))
-		{
-			if (!ci->AccessFor(u).HasPriv("FOUNDER") && !u->HasPriv("botserv/administration"))
-			{
-				source.Reply(ACCESS_DENIED);
-				return;
-			}
-
-			source.Reply(CHAN_INFO_HEADER, ci->name.c_str());
-			info[_("Bot nick")] = ci->bi ? ci->bi->nick : "not assigned yet";
-
-			Anope::string enabled = translate(u, _("Enabled"));
-			Anope::string disabled = translate(u, _("Disabled"));
-
-			if (ci->botflags.HasFlag(BS_KICK_BADWORDS))
-			{
-				if (ci->ttb[TTB_BADWORDS])
-					info[_("Bad words kicker")] = Anope::printf("%s (%d kick(s) to ban)", enabled.c_str(), ci->ttb[TTB_BADWORDS]);
-				else
-					info[_("Bad words kicker")] = enabled;
-			}
-			else
-				info[_("Bad words kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_BOLDS))
-			{
-				if (ci->ttb[TTB_BOLDS])
-					info[_("Bolds kicker")] = Anope::printf("%s (%d kick(s) to ban)", enabled.c_str(), ci->ttb[TTB_BOLDS]);
-				else
-					info[_("Bolds kicker")] = enabled;
-			}
-			else
-				info[_("Bolds kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_CAPS))
-			{
-				if (ci->ttb[TTB_CAPS])
-					info[_("Caps kicker")] = Anope::printf(_("%s (%d kick(s) to ban; minimum %d/%d%%"), enabled.c_str(), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent);
-				else
-					info[_("Caps kicker")] = Anope::printf(_("%s (minimum %d/%d%%)"), enabled.c_str(), ci->capsmin, ci->capspercent);
-			}
-			else
-				info[_("Caps kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_COLORS))
-			{
-				if (ci->ttb[TTB_COLORS])
-					info[_("Colors kicker")] = Anope::printf(_("%s (%d kick(s) to ban)"), enabled.c_str(), ci->ttb[TTB_COLORS]);
-				else
-					info[_("Colors kicker")] = enabled;
-			}
-			else
-				info[_("Colors kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_FLOOD))
-			{
-				if (ci->ttb[TTB_FLOOD])
-					info[_("Flood kicker")] = Anope::printf(_("%s (%d kick(s) to ban; %d lines in %ds"), enabled.c_str(), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs);
-				else
-					info[_("Flood kicker")] = Anope::printf(_("%s (%d lines in %ds)"), enabled.c_str(), ci->floodlines, ci->floodsecs);
-			}
-			else
-				info[_("Flood kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_REPEAT))
-			{
-				if (ci->ttb[TTB_REPEAT])
-					info[_("Repeat kicker")] = Anope::printf(_("%s (%d kick(s) to ban; %d times)"), enabled.c_str(), ci->ttb[TTB_REPEAT], ci->repeattimes);
-				else
-					info[_("Repeat kicker")] = Anope::printf(_("%s (%d times)"), enabled.c_str(), ci->repeattimes);
-			}
-			else
-				info[_("Repeat kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_REVERSES))
-			{
-				if (ci->ttb[TTB_REVERSES])
-					info[_("Reverses kicker")] = Anope::printf(_("%s (%d kick(s) to ban)"), enabled.c_str(), ci->ttb[TTB_REVERSES]);
-				else
-					info[_("Reverses kicker")] = enabled;
-			}
-			else
-				info[_("Reverses kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_UNDERLINES))
-			{
-				if (ci->ttb[TTB_UNDERLINES])
-					info[_("Underlines kicker")] = Anope::printf(_("%s (%d kick(s) to ban)"), enabled.c_str(), ci->ttb[TTB_UNDERLINES]);
-				else
-					info[_("Underlines kicker")] = enabled;
-			}
-			else
-				info[_("Underlines kicker")] = disabled;
-
-                        if (ci->botflags.HasFlag(BS_KICK_ITALICS))
-			{
-				if (ci->ttb[TTB_ITALICS])
-					info[_("Italics kicker")] = Anope::printf(_("%s (%d kick(s) to ban)"), enabled.c_str(), ci->ttb[TTB_ITALICS]);
-				else
-					info[_("Italics kicker")] = enabled;
-			}
-			else
-				info[_("Italics kicker")] = disabled;
-
-			if (ci->botflags.HasFlag(BS_KICK_AMSGS))
-			{
-				if (ci->ttb[TTB_AMSGS])
-					info[_("AMSG kicker")] = Anope::printf(_("%s (%d kick(s) to ban)"), enabled.c_str(), ci->ttb[TTB_AMSGS]);
-				else
-					info[_("AMSG kicker")] = enabled;
-			}
-			else
-				info[_("AMSG kicker")] = disabled;
-
-			Anope::string flags;
-			CheckOptStr(flags, BS_DONTKICKOPS, _("Ops protection"), ci->botflags, u->Account());
-			CheckOptStr(flags, BS_DONTKICKVOICES, _("Voices protection"), ci->botflags, u->Account());
-			CheckOptStr(flags, BS_FANTASY, _("Fantasy"), ci->botflags, u->Account());
-			CheckOptStr(flags, BS_GREET, _("Greet"), ci->botflags, u->Account());
-			CheckOptStr(flags, BS_NOBOT, _("No bot"), ci->botflags, u->Account());
-
-			info[_("Options")] = flags.empty() ? _("None") : flags;
-
-			std::vector<Anope::string> replies;
-			info.Process(replies);
-
-			for (unsigned i = 0; i < replies.size(); ++i)
-				source.Reply(replies[i]);
-		}
-		else
-			source.Reply(_("\002%s\002 is not a valid bot or registered channel."), query.c_str());
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Allows you to see %s information about a channel or a bot.\n"
-				"If the parameter is a channel, then you'll get information\n"
-				"such as enabled kickers. If the parameter is a nick,\n"
-				"you'll get information about a bot, such as creation\n"
-				"time or number of channels it is on."), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class BSInfo : public Module
-{
-	CommandBSInfo commandbsinfo;
-
- public:
-	BSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandbsinfo(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(BSInfo)

modules/commands/cs_access.cpp

@@ -1,851 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-static std::map<Anope::string, int16_t, ci::less> defaultLevels;
-
-static void reset_levels(ChannelInfo *ci)
-{
-	ci->ClearLevels();
-	for (std::map<Anope::string, int16_t, ci::less>::iterator it = defaultLevels.begin(), it_end = defaultLevels.end(); it != it_end; ++it)
-		ci->SetLevel(it->first, it->second);
-}
-
-class AccessChanAccess : public ChanAccess
-{
- public:
-	int level;
-
- 	AccessChanAccess(AccessProvider *p) : ChanAccess(p)
-	{
-	}
-
-	bool HasPriv(const Anope::string &name) const
-	{
-		return this->ci->GetLevel(name) != ACCESS_INVALID && this->level >= this->ci->GetLevel(name);
-	}
-
-	Anope::string Serialize()
-	{
-		return stringify(this->level);
-	}
-
-	void Unserialize(const Anope::string &data)
-	{
-		this->level = convertTo<int>(data);
-	}
-
-	static int DetermineLevel(ChanAccess *access)
-	{
-		if (access->provider->name == "access/access")
-		{
-			AccessChanAccess *aaccess = debug_cast<AccessChanAccess *>(access);
-			return aaccess->level;
-		}
-		else
-		{
-			int highest = 1;
-			const std::vector<Privilege> &privs = PrivilegeManager::GetPrivileges();
-
-			for (unsigned i = 0; i < privs.size(); ++i)
-			{
-				const Privilege &p = privs[i];
-				if (access->ci->GetLevel(p.name) > highest && access->HasPriv(p.name))
-					highest = access->ci->GetLevel(p.name);
-			}
-
-			if (highest >= ACCESS_FOUNDER)
-				highest = ACCESS_FOUNDER - 1;
-
-			return highest;
-		}
-	}
-};
-
-class AccessAccessProvider : public AccessProvider
-{
- public:
-	AccessAccessProvider(Module *o) : AccessProvider(o, "access/access")
-	{
-	}
-
-	ChanAccess *Create()
-	{
-		return new AccessChanAccess(this);
-	}
-};
-
-class CommandCSAccess : public Command
-{
-	void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		Anope::string mask = params[2];
-		int level = ACCESS_INVALID;
-
-		try
-		{
-			level = convertTo<int>(params[3]);
-		}
-		catch (const ConvertException &) { }
-
-		if (!level)
-		{
-			source.Reply(_("Access level must be non-zero."));
-			return;
-		}
-
-		AccessGroup u_access = ci->AccessFor(u);
-		ChanAccess *highest = u_access.Highest();
-		int u_level = (highest ? AccessChanAccess::DetermineLevel(highest) : 0);
-		if (level >= u_level && !u_access.Founder && !u->HasPriv("chanserv/access/modify"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-		else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER)
-		{
-			source.Reply(CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
-			return;
-		}
-
-		bool override = !ci->AccessFor(u).HasPriv("ACCESS_CHANGE") || (level >= u_level && !u_access.Founder);
-
-		if (mask.find_first_of("!*@") == Anope::string::npos && findnick(mask) == NULL)
-			mask += "!*@*";
-
-		for (unsigned i = ci->GetAccessCount(); i > 0; --i)
-		{
-			ChanAccess *access = ci->GetAccess(i - 1);
-			if (mask.equals_ci(access->mask))
-			{
-				/* Don't allow lowering from a level >= u_level */
-				if (AccessChanAccess::DetermineLevel(access) >= u_level && !u_access.Founder && !u->HasPriv("chanserv/access/modify"))
-				{
-					source.Reply(ACCESS_DENIED);
-					return;
-				}
-				ci->EraseAccess(i - 1);
-				break;
-			}
-		}
-
-		if (ci->GetAccessCount() >= Config->CSAccessMax)
-		{
-			source.Reply(_("Sorry, you can only have %d access entries on a channel."), Config->CSAccessMax);
-			return;
-		}
-
-		service_reference<AccessProvider> provider("AccessProvider", "access/access");
-		if (!provider)
-			return;
-		AccessChanAccess *access = debug_cast<AccessChanAccess *>(provider->Create());
-		access->ci = ci;
-		access->mask = mask;
-		access->creator = u->nick;
-		access->level = level;
-		access->last_seen = 0;
-		access->created = Anope::CurTime;
-		ci->AddAccess(access);
-
-		FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, access));
-
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to add " << mask << " with level " << level;
-		source.Reply(_("\002%s\002 added to %s access list at level \002%d\002."), access->mask.c_str(), ci->name.c_str(), level);
-
-		return;
-	}
-
-	void DoDel(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		const Anope::string &mask = params[2];
-
-		if (!ci->GetAccessCount())
-			source.Reply(_("%s access list is empty."), ci->name.c_str());
-		else if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
-		{
-			class AccessDelCallback : public NumberList
-			{
-				CommandSource &source;
-				ChannelInfo *ci;
-				Command *c;
-				unsigned Deleted;
-				Anope::string Nicks;
-				bool Denied;
-				bool override;
-			 public:
-				AccessDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &numlist) : NumberList(numlist, true), source(_source), ci(_ci), c(_c), Deleted(0), Denied(false), override(false)
-				{
-					if (!ci->AccessFor(source.u).HasPriv("ACCESS_CHANGE") && source.u->HasPriv("chanserv/access/modify"))
-						this->override = true;
-				}
-
-				~AccessDelCallback()
-				{
-					if (Denied && !Deleted)
-						source.Reply(ACCESS_DENIED);
-					else if (!Deleted)
-						source.Reply(_("No matching entries on %s access list."), ci->name.c_str());
-					else
-					{
-						Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, c, ci) << "to delete " << Nicks;
-
-						if (Deleted == 1)
-							source.Reply(_("Deleted 1 entry from %s access list."), ci->name.c_str());
-						else
-							source.Reply(_("Deleted %d entries from %s access list."), Deleted, ci->name.c_str());
-					}
-				}
-
-				void HandleNumber(unsigned Number)
-				{
-					if (!Number || Number > ci->GetAccessCount())
-						return;
-
-					User *user = source.u;
-
-					ChanAccess *access = ci->GetAccess(Number - 1);
-
-					AccessGroup u_access = ci->AccessFor(user);
-					ChanAccess *u_highest = u_access.Highest();
-
-					if ((u_highest ? AccessChanAccess::DetermineLevel(u_highest) : 0) <= AccessChanAccess::DetermineLevel(access) && !u_access.Founder && !this->override && !access->mask.equals_ci(user->Account()->display))
-					{
-						Denied = true;
-						return;
-					}
-
-					++Deleted;
-					if (!Nicks.empty())
-						Nicks += ", " + access->mask;
-					else
-						Nicks = access->mask;
-
-					FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, user, access));
-
-					ci->EraseAccess(Number - 1);
-				}
-			}
-			delcallback(source, ci, this, mask);
-			delcallback.Process();
-		}
-		else
-		{
-			AccessGroup u_access = ci->AccessFor(u);
-			ChanAccess *highest = u_access.Highest();
-			int u_level = (highest ? AccessChanAccess::DetermineLevel(highest) : 0);
-
-			for (unsigned i = ci->GetAccessCount(); i > 0; --i)
-			{
-				ChanAccess *access = ci->GetAccess(i - 1);
-				if (mask.equals_ci(access->mask))
-				{
-					int access_level = AccessChanAccess::DetermineLevel(access);
-					if (!access->mask.equals_ci(u->Account()->display) && !u_access.Founder && u_level <= access_level && !u->HasPriv("chanserv/access/modify"))
-						source.Reply(ACCESS_DENIED);
-					else
-					{
-						source.Reply(_("\002%s\002 deleted from %s access list."), access->mask.c_str(), ci->name.c_str());
-						bool override = !u_access.Founder && !u_access.HasPriv("ACCESS_CHANGE") && !access->mask.equals_ci(u->Account()->display);
-						Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to delete " << access->mask;
-
-						FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, access));
-						ci->EraseAccess(access);
-					}
-					return;
-				}
-			}
-
-			source.Reply(_("\002%s\002 not found on %s access list."), mask.c_str(), ci->name.c_str());
-		}
-
-		return;
-	}
-
-	void ProcessList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params, ListFormatter &list)
-	{
-		const Anope::string &nick = params.size() > 2 ? params[2] : "";
-
-		if (!ci->GetAccessCount())
-			source.Reply(_("%s access list is empty."), ci->name.c_str());
-		else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
-		{
-			class AccessListCallback : public NumberList
-			{
-				ListFormatter &list;
-				ChannelInfo *ci;
-
-			 public:
-				AccessListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci)
-				{
-				}
-
-				void HandleNumber(unsigned number)
-				{
-					if (!number || number > ci->GetAccessCount())
-						return;
-
-					ChanAccess *access = ci->GetAccess(number - 1);
-
-					Anope::string timebuf;
-					if (ci->c)
-						for (CUserList::const_iterator cit = ci->c->users.begin(), cit_end = ci->c->users.end(); cit != cit_end; ++cit)
-							if (access->Matches((*cit)->user, (*cit)->user->Account()))
-								timebuf = "Now";
-					if (timebuf.empty())
-					{
-						if (access->last_seen == 0)
-							timebuf = "Never";
-						else
-							timebuf = do_strftime(access->last_seen, NULL, true);
-					}
-
-					ListFormatter::ListEntry entry;
-					entry["Number"] = stringify(number);
-					entry["Level"] = stringify(AccessChanAccess::DetermineLevel(access));
-					entry["Mask"] = access->mask;
-					entry["By"] = access->creator;
-					entry["Last seen"] = timebuf;
-					this->list.addEntry(entry);
-				}
-			}
-			nl_list(list, ci, nick);
-			nl_list.Process();
-		}
-		else
-		{
-			for (unsigned i = 0, end = ci->GetAccessCount(); i < end; ++i)
-			{
-				ChanAccess *access = ci->GetAccess(i);
-
-				if (!nick.empty() && !Anope::Match(access->mask, nick))
-					continue;
-
-				Anope::string timebuf;
-				if (ci->c)
-					for (CUserList::const_iterator cit = ci->c->users.begin(), cit_end = ci->c->users.end(); cit != cit_end; ++cit)
-						if (access->Matches((*cit)->user, (*cit)->user->Account()))
-							timebuf = "Now";
-				if (timebuf.empty())
-				{
-					if (access->last_seen == 0)
-						timebuf = "Never";
-					else
-						timebuf = do_strftime(access->last_seen, NULL, true);
-				}
-
-				ListFormatter::ListEntry entry;
-				entry["Number"] = stringify(i + 1);
-				entry["Level"] = stringify(AccessChanAccess::DetermineLevel(access));
-				entry["Mask"] = access->mask;
-				entry["By"] = access->creator;
-				entry["Last seen"] = timebuf;
-				list.addEntry(entry);
-			}
-		}
-
-		if (list.isEmpty())
-			source.Reply(_("No matching entries on %s access list."), ci->name.c_str());
-		else
-		{
-			std::vector<Anope::string> replies;
-			list.Process(replies);
-
-			source.Reply(_("Access list for %s:"), ci->name.c_str());
-	
-			for (unsigned i = 0; i < replies.size(); ++i)
-				source.Reply(replies[i]);
-
-			source.Reply(_("End of access list"));
-		}
-
-		return;
-	}
-
-	void DoList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		if (!ci->GetAccessCount())
-		{
-			source.Reply(_("%s access list is empty."), ci->name.c_str());
-			return;
-		}
-
-		ListFormatter list;
-		list.addColumn("Number").addColumn("Level").addColumn("Mask");
-		this->ProcessList(source, ci, params, list);
-	}
-
-	void DoView(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		if (!ci->GetAccessCount())
-		{
-			source.Reply(_("%s access list is empty."), ci->name.c_str());
-			return;
-		}
-
-		ListFormatter list;
-		list.addColumn("Number").addColumn("Level").addColumn("Mask").addColumn("By").addColumn("Last seen");
-		this->ProcessList(source, ci, params, list);
-	}
-
-	void DoClear(CommandSource &source, ChannelInfo *ci)
-	{
-		User *u = source.u;
-
-		if (!IsFounder(u, ci) && !u->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
-		else
-		{
-			FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u));
-
-			ci->ClearAccess();
-
-			source.Reply(_("Channel %s access list has been cleared."), ci->name.c_str());
-
-			bool override = !IsFounder(u, ci);
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to clear the access list";
-		}
-
-		return;
-	}
-
- public:
-	CommandCSAccess(Module *creator) : Command(creator, "chanserv/access", 2, 4)
-	{
-		this->SetDesc(_("Modify the list of privileged users"));
-		this->SetSyntax(_("\037channel\037 ADD \037mask\037 \037level\037"));
-		this->SetSyntax(_("\037channel\037 DEL {\037mask\037 | \037entry-num\037 | \037list\037}"));
-		this->SetSyntax(_("\037channel\037 LIST [\037mask\037 | \037list\037]"));
-		this->SetSyntax(_("\037channel\037 VIEW [\037mask\037 | \037list\037]"));
-		this->SetSyntax(_("\037channel\037 CLEAR\002"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &cmd = params[1];
-		const Anope::string &nick = params.size() > 2 ? params[2] : "";
-		const Anope::string &s = params.size() > 3 ? params[3] : "";
-
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		bool is_list = cmd.equals_ci("LIST") || cmd.equals_ci("VIEW");
-		bool is_clear = cmd.equals_ci("CLEAR");
-		bool is_del = cmd.equals_ci("DEL");
-
-		bool has_access = false;
-		if (u->HasPriv("chanserv/access/modify"))
-			has_access = true;
-		else if (is_list && ci->AccessFor(u).HasPriv("ACCESS_LIST"))
-			has_access = true;
-		else if (ci->AccessFor(u).HasPriv("ACCESS_CHANGE"))
-			has_access = true;
-		else if (is_del)
-		{
-			NickAlias *na = findnick(nick);
-			if (na && na->nc == u->Account())
-				has_access = true;
-		}
-
-		/* If LIST, we don't *require* any parameters, but we can take any.
-		 * If DEL, we require a nick and no level.
-		 * Else (ADD), we require a level (which implies a nick). */
-		if (is_list || is_clear ? 0 : (cmd.equals_ci("DEL") ? (nick.empty() || !s.empty()) : s.empty()))
-			this->OnSyntaxError(source, cmd);
-		else if (!has_access)
-			source.Reply(ACCESS_DENIED);
-		else if (readonly && !is_list)
-			source.Reply(_("Sorry, channel access list modification is temporarily disabled."));
-		else if (cmd.equals_ci("ADD"))
-			this->DoAdd(source, ci, params);
-		else if (cmd.equals_ci("DEL"))
-			this->DoDel(source, ci, params);
-		else if (cmd.equals_ci("LIST"))
-			this->DoList(source, ci, params);
-		else if (cmd.equals_ci("VIEW"))
-			this->DoView(source, ci, params);
-		else if (cmd.equals_ci("CLEAR"))
-			this->DoClear(source, ci);
-		else
-			this->OnSyntaxError(source, "");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Maintains the \002access list\002 for a channel.  The access\n"
-				"list specifies which users are allowed chanop status or\n"
-				"access to %s commands on the channel.  Different\n"
-				"user levels allow for access to different subsets of\n"
-				"privileges. Any registered user not on the access list has\n"
-				"a user level of 0, and any unregistered user has a user level\n"
-				"of -1."), source.owner->nick.c_str());
-		source.Reply(" ");
-		source.Reply(_("The \002ACCESS ADD\002 command adds the given mask to the\n"
-				"access list with the given user level; if the mask is\n"
-				"already present on the list, its access level is changed to\n"
-				"the level specified in the command.  The \037level\037 specified\n"
-				"must be less than that of the user giving the command, and\n"
-				"if the \037mask\037 is already on the access list, the current\n"
-				"access level of that nick must be less than the access level\n"
-				"of the user giving the command. When a user joins the channel\n"
-				"the access they receive is from the highest level entry in the\n"
-				"access list."));
-		source.Reply(" ");
-		source.Reply(_("The \002ACCESS DEL\002 command removes the given nick from the\n"
-				"access list.  If a list of entry numbers is given, those\n"
-				"entries are deleted.  (See the example for LIST below.)\n"
-				"You may remove yourself from an access list, even if you\n"
-				"do not have access to modify that list otherwise."));
-		source.Reply(" ");
-		source.Reply(_("The \002ACCESS LIST\002 command displays the access list.  If\n"
-				"a wildcard mask is given, only those entries matching the\n"
-				"mask are displayed.  If a list of entry numbers is given,\n"
-				"only those entries are shown; for example:\n"
-				"   \002ACCESS #channel LIST 2-5,7-9\002\n"
-				"      Lists access entries numbered 2 through 5 and\n"
-				"      7 through 9.\n"
-				" \n"
-				"The \002ACCESS VIEW\002 command displays the access list similar\n"
-				"to \002ACCESS LIST\002 but shows the creator and last used time.\n"
-				" \n"
-				"The \002ACCESS CLEAR\002 command clears all entries of the\n"
-				"access list."));
-		source.Reply(_("\002User access levels\002\n"
-				" \n"
-				"By default, the following access levels are defined:\n"
-				" \n"
-				"   \002Founder\002   Full access to %s functions; automatic\n"
-				"                     opping upon entering channel.  Note\n"
-				"                     that only one person may have founder\n"
-				"                     status (it cannot be given using the\n"
-				"                     \002ACCESS\002 command).\n"
-				"   \002     10\002   Access to AKICK command; automatic opping.\n"
-				"   \002      5\002   Automatic opping.\n"
-				"   \002      3\002   Automatic voicing.\n"
-				"   \002      0\002   No special privileges; can be opped by other\n"
-				"                     ops (unless \002secure-ops\002 is set).\n"
-				" \n"
-				"These levels may be changed, or new ones added, using the\n"
-				"\002LEVELS\002 command; type \002%s%s HELP LEVELS\002 for\n"
-				"information."), source.owner->nick.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CommandCSLevels : public Command
-{
-	void DoSet(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		const Anope::string &what = params[2];
-		const Anope::string &lev = params[3];
-
-		int level;
-
-		if (lev.equals_ci("FOUNDER"))
-			level = ACCESS_FOUNDER;
-		else
-		{
-			try
-			{
-				level = convertTo<int>(lev);
-			}
-			catch (const ConvertException &)
-			{
-				this->OnSyntaxError(source, "SET");
-				return;
-			}
-		}
-
-		if (level <= ACCESS_INVALID || level > ACCESS_FOUNDER)
-			source.Reply(_("Level must be between %d and %d inclusive."), ACCESS_INVALID + 1, ACCESS_FOUNDER - 1);
-		else
-		{
-			Privilege *p = PrivilegeManager::FindPrivilege(what);
-			if (p == NULL)
-				source.Reply(_("Setting \002%s\002 not known.  Type \002%s%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str());
-			else
-			{
-				ci->SetLevel(p->name, level);
-				FOREACH_MOD(I_OnLevelChange, OnLevelChange(u, ci, p->name, level));
-
-				bool override = !ci->AccessFor(u).HasPriv("FOUNDER");
-				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to set " << p->name << " to level " << level;
-
-				if (level == ACCESS_FOUNDER)
-					source.Reply(_("Level for %s on channel %s changed to founder only."), p->name.c_str(), ci->name.c_str());
-				else
-					source.Reply(_("Level for \002%s\002 on channel %s changed to \002%d\002."), p->name.c_str(), ci->name.c_str(), level);
-			}
-		}
-	}
-
-	void DoDisable(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		const Anope::string &what = params[2];
-
-		/* Don't allow disabling of the founder level. It would be hard to change it back if you dont have access to use this command */
-		if (!what.equals_ci("FOUNDER"))
-		{
-			Privilege *p = PrivilegeManager::FindPrivilege(what);
-			if (p != NULL)
-			{
-				ci->SetLevel(p->name, ACCESS_INVALID);
-				FOREACH_MOD(I_OnLevelChange, OnLevelChange(u, ci, p->name, ACCESS_INVALID));
-
-				bool override = !ci->AccessFor(u).HasPriv("FOUNDER");
-				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to disable " << p->name;
-
-				source.Reply(_("\002%s\002 disabled on channel %s."), p->name.c_str(), ci->name.c_str());
-				return;
-			}
-		}
-
-		source.Reply(_("Setting \002%s\002 not known.  Type \002%s%s HELP LEVELS \002 for a list of valid settings."), what.c_str(), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str());
-
-		return;
-	}
-
-	void DoList(CommandSource &source, ChannelInfo *ci)
-	{
-		source.Reply(_("Access level settings for channel %s:"), ci->name.c_str());
-
-		ListFormatter list;
-		list.addColumn("Name").addColumn("Level");
-
-		const std::vector<Privilege> &privs = PrivilegeManager::GetPrivileges();
-
-		for (unsigned i = 0; i < privs.size(); ++i)
-		{
-			const Privilege &p = privs[i];
-			int16_t j = ci->GetLevel(p.name);
-
-			ListFormatter::ListEntry entry;
-			entry["Name"] = p.name;
-
-			if (j == ACCESS_INVALID)
-				entry["Level"] = "(disabled)";
-			else if (j == ACCESS_FOUNDER)
-				entry["Level"] = "(founder only)";
-			else
-				entry["Level"] = stringify(j);
-
-			list.addEntry(entry);
-		}
-
-		std::vector<Anope::string> replies;
-		list.Process(replies);
-
-		for (unsigned i = 0; i < replies.size(); ++i)
-			source.Reply(replies[i]);
-	}
-
-	void DoReset(CommandSource &source, ChannelInfo *ci)
-	{
-		User *u = source.u;
-
-		reset_levels(ci);
-		FOREACH_MOD(I_OnLevelChange, OnLevelChange(u, ci, "ALL", 0));
-
-		bool override = !ci->AccessFor(u).HasPriv("FOUNDER");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to reset all levels";
-
-		source.Reply(_("Access levels for \002%s\002 reset to defaults."), ci->name.c_str());
-		return;
-	}
-
- public:
-	CommandCSLevels(Module *creator) : Command(creator, "chanserv/levels", 2, 4)
-	{
-		this->SetDesc(_("Redefine the meanings of access levels"));
-		this->SetSyntax(_("\037channel\037 SET \037type\037 \037level\037"));
-		this->SetSyntax(_("\037channel\037 {DIS | DISABLE} \037type\037"));
-		this->SetSyntax(_("\037channel\037 LIST"));
-		this->SetSyntax(_("\037channel\037 RESET"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &cmd = params[1];
-		const Anope::string &what = params.size() > 2 ? params[2] : "";
-		const Anope::string &s = params.size() > 3 ? params[3] : "";
-
-		User *u = source.u;
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		/* If SET, we want two extra parameters; if DIS[ABLE] or FOUNDER, we want only
-		 * one; else, we want none.
-		 */
-		if (cmd.equals_ci("SET") ? s.empty() : (cmd.substr(0, 3).equals_ci("DIS") ? (what.empty() || !s.empty()) : !what.empty()))
-			this->OnSyntaxError(source, cmd);
-		else if (!ci->AccessFor(u).HasPriv("FOUNDER") && !u->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
-		else if (cmd.equals_ci("SET"))
-			this->DoSet(source, ci, params);
-		else if (cmd.equals_ci("DIS") || cmd.equals_ci("DISABLE"))
-			this->DoDisable(source, ci, params);
-		else if (cmd.equals_ci("LIST"))
-			this->DoList(source, ci);
-		else if (cmd.equals_ci("RESET"))
-			this->DoReset(source, ci);
-		else
-			this->OnSyntaxError(source, "");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		if (subcommand.equals_ci("DESC"))
-		{
-			source.Reply(_("The following feature/function names are understood."));
-
-			ListFormatter list;
-			list.addColumn("Name").addColumn("Description");
-
-			const std::vector<Privilege> &privs = PrivilegeManager::GetPrivileges();
-			for (unsigned i = 0; i < privs.size(); ++i)
-			{
-				const Privilege &p = privs[i];
-				ListFormatter::ListEntry entry;
-				entry["Name"] = p.name;
-				entry["Description"] = translate(source.u, p.desc.c_str());
-				list.addEntry(entry);
-			}
-
-			std::vector<Anope::string> replies;
-			list.Process(replies);
-
-			for (unsigned i = 0; i < replies.size(); ++i)
-				source.Reply(replies[i]);
-		}
-		else
-		{
-			this->SendSyntax(source);
-			source.Reply(" ");
-			source.Reply(_("The \002LEVELS\002 command allows fine control over the meaning of\n"
-					"the numeric access levels used for channels.  With this\n"
-					"command, you can define the access level required for most\n"
-					"of %s's functions. (The \002SET FOUNDER\002 and this command\n"
-					"are always restricted to the channel founder.)\n"
-					" \n"
-					"\002LEVELS SET\002 allows the access level for a function or group of\n"
-					"functions to be changed. \002LEVELS DISABLE\002 (or \002DIS\002 for short)\n"
-					"disables an automatic feature or disallows access to a\n"
-					"function by anyone, INCLUDING the founder (although, the founder\n"
-					"can always reenable it).\n"
-					" \n"
-					"\002LEVELS LIST\002 shows the current levels for each function or\n"
-					"group of functions. \002LEVELS RESET\002 resets the levels to the\n"
-					"default levels of a newly-created channel (see\n"
-					"\002HELP ACCESS LEVELS\002).\n"
-					" \n"
-					"For a list of the features and functions whose levels can be\n"
-					"set, see \002HELP LEVELS DESC\002."), source.owner->nick.c_str());
-		}
-		return true;
-	}
-};
-
-class CSAccess : public Module
-{
-	AccessAccessProvider accessprovider;
-	CommandCSAccess commandcsaccess;
-	CommandCSLevels commandcslevels;
-
- public:
-	CSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		accessprovider(this), commandcsaccess(this), commandcslevels(this)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation i[] = { I_OnReload, I_OnCreateChan, I_OnGroupCheckPriv };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-
-		try
-		{
-			this->OnReload();
-		}
-		catch (const ConfigException &ex)
-		{
-			throw ModuleException(ex.GetReason());
-		}
-	}
-
-	void OnReload()
-	{
-		defaultLevels.clear();
-		ConfigReader config;
-
-		for (int i = 0; i < config.Enumerate("privilege"); ++i)
-		{
-			const Anope::string &pname = config.ReadValue("privilege", "name", "", i);
-
-			Privilege *p = PrivilegeManager::FindPrivilege(pname);
-			if (p == NULL)
-				continue;
-
-			const Anope::string &value = config.ReadValue("privilege", "level", "", i);
-			if (value.empty())
-				continue;
-			else if (value.equals_ci("founder"))
-				defaultLevels[p->name] = ACCESS_FOUNDER;
-			else if (value.equals_ci("disabled"))
-				defaultLevels[p->name] = ACCESS_INVALID;
-			else
-				defaultLevels[p->name] = config.ReadInteger("privilege", "level", i, false);
-		}
-	}
-
-	void OnCreateChan(ChannelInfo *ci)
-	{
-		reset_levels(ci);
-	}
-
-	EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv)
-	{
-		if (group->ci == NULL)
-			return EVENT_CONTINUE;
-		/* Special case. Allows a level of < 0 to match anyone, and a level of 0 to match anyone identified. */
-		int16_t level = group->ci->GetLevel(priv);
-		if (level < 0)
-			return EVENT_ALLOW;
-		else if (level == 0 && group->nc)
-			return EVENT_ALLOW;
-		return EVENT_CONTINUE;
-	}
-};
-
-MODULE_INIT(CSAccess)

modules/commands/cs_akick.cpp

@@ -1,510 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-static void split_usermask(const Anope::string &mask, Anope::string &nick, Anope::string &user, Anope::string &host)
-{
-	size_t ex = mask.find('!'), at = mask.find('@', ex == Anope::string::npos ? 0 : ex + 1);
-	if (ex == Anope::string::npos)
-	{
-		if (at == Anope::string::npos)
-		{
-			nick = mask;
-			user = host = "*";
-		}
-		else
-		{
-			nick = "*";
-			user = mask.substr(0, at);
-			host = mask.substr(at + 1);
-		}
-	}
-	else
-	{
-		nick = mask.substr(0, ex);
-		if (at == Anope::string::npos)
-		{
-			user = mask.substr(ex + 1);
-			host = "*";
-		}
-		else
-		{
-			user = mask.substr(ex + 1, at - ex - 1);
-			host = mask.substr(at + 1);
-		}
-	}
-}
-
-class CommandCSAKick : public Command
-{
-	void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		Anope::string mask = params[2];
-		Anope::string reason = params.size() > 3 ? params[3] : "";
-		NickAlias *na = findnick(mask);
-		NickCore *nc = NULL;
-		AutoKick *akick;
-
-		if (!na)
-		{
-			Anope::string nick, user, host;
-
-			split_usermask(mask, nick, user, host);
-			mask = nick + "!" + user + "@" + host;
-		}
-		else
-			nc = na->nc;
-
-		/* Check excepts BEFORE we get this far */
-		if (ci->c)
-		{
-			std::pair<Channel::ModeList::iterator, Channel::ModeList::iterator> modes = ci->c->GetModeList(CMODE_EXCEPT);
-			for (; modes.first != modes.second; ++modes.first)
-			{
-				if (Anope::Match(modes.first->second, mask))
-				{
-					source.Reply(CHAN_EXCEPTED, mask.c_str(), ci->name.c_str());
-					return;
-				}
-			}
-		}
-
-		/* Check whether target nick has equal/higher access
-		* or whether the mask matches a user with higher/equal access - Viper */
-		if (ci->HasFlag(CI_PEACE) && nc)
-		{
-			AccessGroup nc_access = ci->AccessFor(nc), u_access = ci->AccessFor(u);
-			if (nc == ci->GetFounder() || nc_access >= u_access)
-			{
-				source.Reply(ACCESS_DENIED);
-				return;
-			}
-		}
-		else if (ci->HasFlag(CI_PEACE))
-		{
-			/* Match against all currently online users with equal or
-			 * higher access. - Viper */
-			for (Anope::insensitive_map<User *>::iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ++it)
-			{
-				User *u2 = it->second;
-
-				AccessGroup nc_access = ci->AccessFor(nc), u_access = ci->AccessFor(u);
-				Entry entry_mask(CMODE_BEGIN, mask);
-
-				if ((ci->AccessFor(u2).HasPriv("FOUNDER") || nc_access >= u_access) && entry_mask.Matches(u2))
-				{
-					source.Reply(ACCESS_DENIED);
-					return;
-				}
-			}
-
-			/* Match against the lastusermask of all nickalias's with equal
-			 * or higher access. - Viper */
-			for (nickalias_map::const_iterator it = NickAliasList.begin(), it_end = NickAliasList.end(); it != it_end; ++it)
-			{
-				na = it->second;
-
-				AccessGroup nc_access = ci->AccessFor(na->nc), u_access = ci->AccessFor(u);
-				if (na->nc && (na->nc == ci->GetFounder() || nc_access >= u_access))
-				{
-					Anope::string buf = na->nick + "!" + na->last_usermask;
-					if (Anope::Match(buf, mask))
-					{
-						source.Reply(ACCESS_DENIED);
-						return;
-					}
-				}
-			 }
-		}
-
-		for (unsigned j = 0, end = ci->GetAkickCount(); j < end; ++j)
-		{
-			akick = ci->GetAkick(j);
-			if (akick->HasFlag(AK_ISNICK) ? akick->nc == nc : mask.equals_ci(akick->mask))
-			{
-				source.Reply(_("\002%s\002 already exists on %s autokick list."), akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), ci->name.c_str());
-				return;
-			}
-		}
-
-		if (ci->GetAkickCount() >= Config->CSAutokickMax)
-		{
-			source.Reply(_("Sorry, you can only have %d autokick masks on a channel."), Config->CSAutokickMax);
-			return;
-		}
-
-		if (nc)
-			akick = ci->AddAkick(u->nick, nc, reason);
-		else
-			akick = ci->AddAkick(u->nick, mask, reason);
-
-		bool override = !ci->AccessFor(u).HasPriv("AKICK");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to add " << mask << (reason == "" ? "" : ": ") << reason;
-
-		FOREACH_MOD(I_OnAkickAdd, OnAkickAdd(u, ci, akick));
-
-		source.Reply(_("\002%s\002 added to %s autokick list."), mask.c_str(), ci->name.c_str());
-
-		this->DoEnforce(source, ci);
-	}
-
-	void DoDel(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		const Anope::string &mask = params[2];
-		AutoKick *akick;
-		unsigned i, end;
-
-		if (!ci->GetAkickCount())
-		{
-			source.Reply(_("%s autokick list is empty."), ci->name.c_str());
-			return;
-		}
-
-		/* Special case: is it a number/list?  Only do search if it isn't. */
-		if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
-		{
-			class AkickDelCallback : public NumberList
-			{
-				CommandSource &source;
-				ChannelInfo *ci;
-				Command *c;
-				unsigned Deleted;
-			 public:
-				AkickDelCallback(CommandSource &_source, ChannelInfo *_ci, Command *_c, const Anope::string &list) : NumberList(list, true), source(_source), ci(_ci), c(_c), Deleted(0)
-				{
-				}
-
-				~AkickDelCallback()
-				{
-					bool override = !ci->AccessFor(source.u).HasPriv("AKICK");
-					Log(override ? LOG_OVERRIDE : LOG_COMMAND, source.u, c, ci) << "to delete " << Deleted << (Deleted == 1 ? " entry" : " entries");
-
-					if (!Deleted)
-						source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
-					else if (Deleted == 1)
-						source.Reply(_("Deleted 1 entry from %s autokick list."), ci->name.c_str());
-					else
-						source.Reply(_("Deleted %d entries from %s autokick list."), Deleted, ci->name.c_str());
-				}
-
-				void HandleNumber(unsigned Number)
-				{
-					if (!Number || Number > ci->GetAkickCount())
-						return;
-
-					++Deleted;
-					ci->EraseAkick(Number - 1);
-				}
-			}
-			delcallback(source, ci, this, mask);
-			delcallback.Process();
-		}
-		else
-		{
-			NickAlias *na = findnick(mask);
-			NickCore *nc = na ? na->nc : NULL;
-
-			for (i = 0, end = ci->GetAkickCount(); i < end; ++i)
-			{
-				akick = ci->GetAkick(i);
-
-				if ((akick->HasFlag(AK_ISNICK) && akick->nc == nc) || (!akick->HasFlag(AK_ISNICK) && mask.equals_ci(akick->mask)))
-					break;
-			}
-
-			if (i == ci->GetAkickCount())
-			{
-				source.Reply(_("\002%s\002 not found on %s autokick list."), mask.c_str(), ci->name.c_str());
-				return;
-			}
-
-			bool override = !ci->AccessFor(u).HasPriv("AKICK");
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to delete " << mask;
-
-			ci->EraseAkick(i);
-
-			source.Reply(_("\002%s\002 deleted from %s autokick list."), mask.c_str(), ci->name.c_str());
-		}
-	}
-
-	void ProcessList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params, ListFormatter &list)
-	{
-		const Anope::string &mask = params.size() > 2 ? params[2] : "";
-
-		if (!mask.empty() && isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
-		{
-			class AkickListCallback : public NumberList
-			{
-				ListFormatter &list;
-				ChannelInfo *ci;
-
-			 public:
-				AkickListCallback(ListFormatter &_list, ChannelInfo *_ci, const Anope::string &numlist) : NumberList(numlist, false), list(_list), ci(_ci)
-				{
-				}
-
-				void HandleNumber(unsigned number)
-				{
-					if (!number || number > ci->GetAkickCount())
-						return;
-	
-					AutoKick *akick = ci->GetAkick(number - 1);
-
-					Anope::string timebuf, lastused;
-					if (akick->addtime)
-						timebuf = do_strftime(akick->addtime, NULL, false);
-					else
-						timebuf = UNKNOWN;
-					if (akick->last_used)
-						lastused = do_strftime(akick->last_used, NULL, false);
-					else
-						lastused = UNKNOWN;
-
-					ListFormatter::ListEntry entry;
-					entry["Number"] = stringify(number);
-					entry["Mask"] = akick->mask;
-					entry["Creator"] = akick->creator;
-					entry["Created"] = timebuf;
-					entry["Last used"] = lastused;
-					entry["Reason"] = akick->reason;
-					this->list.addEntry(entry);
-				}
-			}
-			nl_list(list, ci, mask);
-			nl_list.Process();
-		}
-		else
-		{
-			for (unsigned i = 0, end = ci->GetAkickCount(); i < end; ++i)
-			{
-				AutoKick *akick = ci->GetAkick(i);
-
-				if (!mask.empty())
-				{
-					if (!akick->HasFlag(AK_ISNICK) && !Anope::Match(akick->mask, mask))
-						continue;
-					if (akick->HasFlag(AK_ISNICK) && !Anope::Match(akick->nc->display, mask))
-						continue;
-				}
-
-				Anope::string timebuf, lastused;
-				if (akick->addtime)
-					timebuf = do_strftime(akick->addtime);
-				else
-					timebuf = UNKNOWN;
-				if (akick->last_used)
-					lastused = do_strftime(akick->last_used);
-				else
-					lastused = UNKNOWN;
-
-				ListFormatter::ListEntry entry;
-				entry["Number"] = stringify(i + 1);
-				entry["Mask"] = akick->mask;
-				entry["Creator"] = akick->creator;
-				entry["Created"] = timebuf;
-				entry["Last used"] = lastused;
-				entry["Reason"] = akick->reason;
-				list.addEntry(entry);
-			}
-		}
-
-		if (list.isEmpty())
-			source.Reply(_("No matching entries on %s autokick list."), ci->name.c_str());
-		else
-		{
-			std::vector<Anope::string> replies;
-			list.Process(replies);
-
-			source.Reply(_("Autokick list for %s:"), ci->name.c_str());
-	
-			for (unsigned i = 0; i < replies.size(); ++i)
-				source.Reply(replies[i]);
-
-			source.Reply(_("End of autokick list"));
-		}
-	}
-
-	void DoList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		if (!ci->GetAkickCount())
-		{
-			source.Reply(_("%s autokick list is empty."), ci->name.c_str());
-			return;
-		}
-
-		ListFormatter list;
-		list.addColumn("Number").addColumn("Mask").addColumn("Reason");
-		this->ProcessList(source, ci, params, list);
-	}
-
-	void DoView(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		if (!ci->GetAkickCount())
-		{
-			source.Reply(_("%s autokick list is empty."), ci->name.c_str());
-			return;
-		}
-
-		ListFormatter list;
-		list.addColumn("Number").addColumn("Mask").addColumn("Creator").addColumn("Created").addColumn("Last used").addColumn("Reason");
-		this->ProcessList(source, ci, params, list);
-	}
-
-	void DoEnforce(CommandSource &source, ChannelInfo *ci)
-	{
-		User *u = source.u;
-		Channel *c = ci->c;
-		int count = 0;
-
-		if (!c)
-		{
-			source.Reply(CHAN_X_NOT_IN_USE, ci->name.c_str());
-			return;
-		}
-
-		for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; )
-		{
-			UserContainer *uc = *it++;
-
-			if (ci->CheckKick(uc->user))
-				++count;
-		}
-
-		bool override = !ci->AccessFor(u).HasPriv("AKICK");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ENFORCE, affects " << count << " users";
-
-		source.Reply(_("AKICK ENFORCE for \002%s\002 complete; \002%d\002 users were affected."), ci->name.c_str(), count);
-	}
-
-	void DoClear(CommandSource &source, ChannelInfo *ci)
-	{
-		User *u = source.u;
-		bool override = !ci->AccessFor(u).HasPriv("AKICK");
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to clear the akick list";
-
-		ci->ClearAkick();
-		source.Reply(_("Channel %s akick list has been cleared."), ci->name.c_str());
-	}
-
- public:
-	CommandCSAKick(Module *creator) : Command(creator, "chanserv/akick", 2, 4)
-	{
-		this->SetDesc(_("Maintain the AutoKick list"));
-		this->SetSyntax(_("\037channel\037 ADD {\037nick\037 | \037mask\037} [\037reason\037]"));
-		this->SetSyntax(_("\037channel\037 DEL {\037nick\037 | \037mask\037 | \037entry-num\037 | \037list\037}"));
-		this->SetSyntax(_("\037channel\037 LIST [\037mask\037 | \037entry-num\037 | \037list\037]"));
-		this->SetSyntax(_("\037channel\037 VIEW [\037mask\037 | \037entry-num\037 | \037list\037]"));
-		this->SetSyntax(_("\037channel\037 ENFORCE"));
-		this->SetSyntax(_("\037channel\037 CLEAR"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		Anope::string chan = params[0];
-		Anope::string cmd = params[1];
-		Anope::string mask = params.size() > 2 ? params[2] : "";
-
-		User *u = source.u;
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (mask.empty() && (cmd.equals_ci("ADD") || cmd.equals_ci("DEL")))
-			this->OnSyntaxError(source, cmd);
-		else if (!ci->AccessFor(u).HasPriv("AKICK") && !u->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
-		else if (!cmd.equals_ci("LIST") && !cmd.equals_ci("VIEW") && !cmd.equals_ci("ENFORCE") && readonly)
-			source.Reply(_("Sorry, channel autokick list modification is temporarily disabled."));
-		else if (cmd.equals_ci("ADD"))
-			this->DoAdd(source, ci, params);
-		else if (cmd.equals_ci("DEL"))
-			this->DoDel(source, ci, params);
-		else if (cmd.equals_ci("LIST"))
-			this->DoList(source, ci, params);
-		else if (cmd.equals_ci("VIEW"))
-			this->DoView(source, ci, params);
-		else if (cmd.equals_ci("ENFORCE"))
-			this->DoEnforce(source, ci);
-		else if (cmd.equals_ci("CLEAR"))
-			this->DoClear(source, ci);
-		else
-			this->OnSyntaxError(source, "");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Maintains the \002AutoKick list\002 for a channel.  If a user\n"
-				"on the AutoKick list attempts to join the channel,\n"
-				"%s will ban that user from the channel, then kick\n"
-				"the user.\n"
-				" \n"
-				"The \002AKICK ADD\002 command adds the given nick or usermask\n"
-				"to the AutoKick list.  If a \037reason\037 is given with\n"
-				"the command, that reason will be used when the user is\n"
-				"kicked; if not, the default reason is \"You have been\n"
-				"banned from the channel\".\n"
-				"When akicking a \037registered nick\037 the nickserv account\n"
-				"will be added to the akick list instead of the mask.\n"
-				"All users within that nickgroup will then be akicked.\n"),
-				source.owner->nick.c_str());
-		source.Reply(_(
-				" \n"
-				"The \002AKICK DEL\002 command removes the given nick or mask\n"
-				"from the AutoKick list.  It does not, however, remove any\n"
-				"bans placed by an AutoKick; those must be removed\n"
-				"manually.\n"
-				" \n"
-				"The \002AKICK LIST\002 command displays the AutoKick list, or\n"
-				"optionally only those AutoKick entries which match the\n"
-				"given mask.\n"
-				" \n"
-				"The \002AKICK VIEW\002 command is a more verbose version of\n"
-				"\002AKICK LIST\002 command.\n"
-				" \n"
-				"The \002AKICK ENFORCE\002 command causes %s to enforce the\n"
-				"current AKICK list by removing those users who match an\n"
-				"AKICK mask.\n"
-				" \n"
-				"The \002AKICK CLEAR\002 command clears all entries of the\n"
-				"akick list."), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CSAKick : public Module
-{
-	CommandCSAKick commandcsakick;
-
- public:
-	CSAKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcsakick(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSAKick)

modules/commands/cs_ban.cpp

@@ -1,148 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSBan : public Command
-{
- public:
-	CommandCSBan(Module *creator) : Command(creator, "chanserv/ban", 2, 3)
-	{
-		this->SetDesc(_("Bans a selected nick on a channel"));
-		this->SetSyntax(_("\037channel\037 \037nick\037 [\037reason\037]"));
-		this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-		const Anope::string &target = params[1];
-		const Anope::string &reason = params.size() > 2 ? params[2] : "Requested";
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		User *u = source.u;
-		Channel *c = ci->c;
-		User *u2 = finduser(target);
-
-		AccessGroup u_access = ci->AccessFor(u);
-
-		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
-		else if (!u_access.HasPriv("BAN"))
-			source.Reply(ACCESS_DENIED);
-		/*
-		 * Dont ban/kick the user on channels where he is excepted
-		 * to prevent services <-> server wars.
-		 */
-		else if (u2)
-		{
-			AccessGroup u2_access = ci->AccessFor(u2);
-
-			if (u != u2 && ci->HasFlag(CI_PEACE) && u2_access >= u_access)
-				source.Reply(ACCESS_DENIED);
-			else if (matches_list(ci->c, u2, CMODE_EXCEPT))
-				source.Reply(CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str());
-			else if (u2->IsProtected())
-				source.Reply(ACCESS_DENIED);
-			else
-			{
-				Anope::string mask;
-				get_idealban(ci, u2, mask);
-
-				// XXX need a way to detect if someone is overriding
-				Log(LOG_COMMAND, u, this, ci) << "for " << mask;
-
-				c->SetMode(NULL, CMODE_BAN, mask);
-
-				/* We still allow host banning while not allowing to kick */
-				if (!c->FindUser(u2))
-					return;
-
-				if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !ci->AccessFor(u).HasPriv("SIGNKICK")))
-					c->Kick(ci->WhoSends(), u2, "%s (%s)", reason.c_str(), u->nick.c_str());
-				else
-					c->Kick(ci->WhoSends(), u2, "%s", reason.c_str());
-			}
-		}
-		else if (u_access.HasPriv("FOUNDER"))
-		{
-			Log(LOG_COMMAND, u, this, ci) << "for " << target;
-
-			c->SetMode(NULL, CMODE_BAN, target);
-
-			int matched = 0, kicked = 0;
-			for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end;)
-			{
-				UserContainer *uc = *it++;
-
-				if (Anope::Match(uc->user->nick, target) || Anope::Match(uc->user->GetDisplayedMask(), target))
-				{
-					++matched;
-
-					AccessGroup u2_access = ci->AccessFor(uc->user);
-
-					if (u != uc->user && ci->HasFlag(CI_PEACE) && u2_access >= u_access)
-						continue;
-					else if (matches_list(ci->c, uc->user, CMODE_EXCEPT))
-						continue;
-					else if (uc->user->IsProtected())
-						continue;
-
-					++kicked;
-					if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !u_access.HasPriv("SIGNKICK")))
-						c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s) (%s)", reason.c_str(), target.c_str(), u->nick.c_str());
-					else
-						c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s)", reason.c_str(), target.c_str());
-				}
-			}
-
-			if (matched)
-				source.Reply(_("Kicked %d/%d users matching %s from %s."), kicked, matched, target.c_str(), c->name.c_str());
-			else
-				source.Reply(_("No users on %s match %s."), c->name.c_str(), target.c_str());
-		}
-		else
-			source.Reply(NICK_X_NOT_IN_USE, target.c_str());
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Bans a selected nick on a channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel. Channel founders may ban masks."));
-		return true;
-	}
-};
-
-class CSBan : public Module
-{
-	CommandCSBan commandcsban;
-
- public:
-	CSBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsban(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSBan)

modules/commands/cs_drop.cpp

@@ -1,99 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSDrop : public Command
-{
- public:
-	CommandCSDrop(Module *creator) : Command(creator, "chanserv/drop", 1, 1)
-	{
-		this->SetDesc(_("Cancel the registration of a channel"));
-		this->SetSyntax(_("\037channel\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-
-		User *u = source.u;
-
-		if (readonly)
-		{
-			source.Reply(_("Sorry, channel de-registration is temporarily disabled.")); // XXX: READ_ONLY_MODE?
-			return;
-		}
-
-		ChannelInfo *ci = cs_findchan(chan);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (ci->HasFlag(CI_SUSPENDED) && !u->HasCommand("chanserv/drop"))
-		{
-			source.Reply(CHAN_X_SUSPENDED, chan.c_str());
-			return;
-		}
-
-		if ((ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv("FOUNDER")) && !u->HasCommand("chanserv/drop"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (ci->c && ModeManager::FindChannelModeByName(CMODE_REGISTERED))
-			ci->c->RemoveMode(NULL, CMODE_REGISTERED, "", false);
-
-		bool override = (ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv("FOUNDER"));
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "(founder was: " << (ci->GetFounder() ? ci->GetFounder()->display : "none") << ")";
-
-		delete ci;
-
-		source.Reply(_("Channel \002%s\002 has been dropped."), chan.c_str());
-
-		FOREACH_MOD(I_OnChanDrop, OnChanDrop(chan));
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		User *u = source.u;
-		this->SendSyntax(source);
-		source.Reply(" ");
-		if (u->IsServicesOper())
-			source.Reply(_("Unregisters the named channel.  Only \002Services Operators\002\n"
-					"can drop a channel for which they have not identified."));
-		else
-			source.Reply(_("Unregisters the named channel.  Can only be used by\n"
-					"\002channel founder\002."));
-
-		return true;
-	}
-};
-
-class CSDrop : public Module
-{
-	CommandCSDrop commandcsdrop;
-
- public:
-	CSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsdrop(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSDrop)

modules/commands/cs_entrymsg.cpp

@@ -1,255 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-struct EntryMsg : Serializable
-{
-	ChannelInfo *ci;
-	Anope::string creator;
-	Anope::string message;
-	time_t when;
-
-	EntryMsg(ChannelInfo *c, const Anope::string &cname, const Anope::string &cmessage, time_t ct = Anope::CurTime)
-	{
-	
-		this->ci = c;
-		this->creator = cname;
-		this->message = cmessage;
-		this->when = ct;
-	}
-
-	Anope::string serialize_name() const
-	{
-		return "EntryMsg";
-	}
-
-	serialized_data serialize()
-	{
-		serialized_data data;
-
-		data["ci"] << this->ci->name;
-		data["creator"] << this->creator;
-		data["message"] << this->message;
-		data["when"].setType(Serialize::DT_INT) << this->when;
-
-		return data;
-	}
-
-	static void unserialize(serialized_data &data);
-};
-
-static unsigned MaxEntries = 0;
-
-struct EntryMessageList : std::vector<EntryMsg>, ExtensibleItem
-{
-};
-
-void EntryMsg::unserialize(serialized_data &data)
-{
-	ChannelInfo *ci = cs_findchan(data["ci"].astr());
-	if (!ci)
-		return;
-
-	EntryMessageList *messages = ci->GetExt<EntryMessageList *>("cs_entrymsg");
-	if (messages == NULL)
-	{
-		messages = new EntryMessageList();
-		ci->Extend("cs_entrymsg", messages);
-	}
-
-	messages->push_back(EntryMsg(ci, data["creator"].astr(), data["message"].astr()));
-}
-
-class CommandEntryMessage : public Command
-{
- private:
-	void DoList(CommandSource &source, ChannelInfo *ci)
-	{
-		EntryMessageList *messages = ci->GetExt<EntryMessageList *>("cs_entrymsg");
-		if (messages == NULL)
-		{
-			source.Reply(_("Entry message list for \002%s\002 is empty."), ci->name.c_str());
-			return;
-		}
-
-		source.Reply(_("Entry message list for \002%s\002:"), ci->name.c_str());
-
-		ListFormatter list;
-		list.addColumn("Number").addColumn("Creator").addColumn("Created").addColumn("Message");
-		for (unsigned i = 0; i < messages->size(); ++i)
-		{
-			EntryMsg &msg = messages->at(i);
-
-			ListFormatter::ListEntry entry;
-			entry["Number"] = stringify(i + 1);
-			entry["Creator"] = msg.creator;
-			entry["Created"] = do_strftime(msg.when);
-			entry["Message"] = msg.message;
-			list.addEntry(entry);
-		}
-
-		std::vector<Anope::string> replies;
-		list.Process(replies);
-		for (unsigned i = 0; i < replies.size(); ++i)
-			source.Reply(replies[i]);
-
-		source.Reply(_("End of entry message list."));
-	}
-		
-	void DoAdd(CommandSource &source, ChannelInfo *ci, const Anope::string &message)
-	{
-		EntryMessageList *messages = ci->GetExt<EntryMessageList *>("cs_entrymsg");
-		if (messages == NULL)
-		{
-			messages = new EntryMessageList();
-			ci->Extend("cs_entrymsg", messages);
-		}
-
-		if (MaxEntries && messages->size() >= MaxEntries)
-			source.Reply(_("The entry message list for \002%s\002 is full."), ci->name.c_str());
-		else
-		{
-			messages->push_back(EntryMsg(ci, source.u->nick, message));
-			source.Reply(_("Entry message added to \002%s\002"), ci->name.c_str());
-		}
-	}
-
-	void DoDel(CommandSource &source, ChannelInfo *ci, const Anope::string &message)
-	{
-		EntryMessageList *messages = ci->GetExt<EntryMessageList *>("cs_entrymsg");
-		if (!message.is_pos_number_only())
-			source.Reply(("Entry message \002%s\002 not found on channel \002%s\002."), message.c_str(), ci->name.c_str());
-		else if (messages != NULL)
-		{
-			try
-			{
-				unsigned i = convertTo<unsigned>(message);
-				if (i > 0 && i <= messages->size())
-				{
-					messages->erase(messages->begin() + i - 1);
-					if (messages->empty())
-						ci->Shrink("cs_entrymsg");
-					source.Reply(_("Entry message \002%i\002 for \002%s\002 deleted."), i, ci->name.c_str());
-				}
-				else
-					throw ConvertException();
-			}
-			catch (const ConvertException &)
-			{
-				source.Reply(_("Entry message \002%s\002 not found on channel \002%s\002."), message.c_str(), ci->name.c_str());
-			}
-		}
-		else
-			source.Reply(_("Entry message list for \002%s\002 is empty."), ci->name.c_str());
-	}
-
-	void DoClear(CommandSource &source, ChannelInfo *ci)
-	{
-		ci->Shrink("cs_entrymsg");
-		source.Reply(_("Entry messages for \002%s\002 have been cleared."), ci->name.c_str());
-	}
-
- public:
-	CommandEntryMessage(Module *creator) : Command(creator, "chanserv/entrymsg", 2, 3)
-	{
-		this->SetDesc(_("Manage the channel's entry messages"));
-		this->SetSyntax(_("\037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (IsFounder(u, ci) || u->HasCommand("chanserv/set"))
-		{
-			bool success = true;
-			if (params[1].equals_ci("LIST"))
-				this->DoList(source, ci);
-			else if (params[1].equals_ci("CLEAR"))
-				this->DoClear(source, ci);
-			else if (params.size() < 3)
-			{
-				success = false;
-				this->OnSyntaxError(source, "");
-			}
-			else if (params[1].equals_ci("ADD"))
-				this->DoAdd(source, ci, params[2]);
-			else if (params[1].equals_ci("DEL"))
-				this->DoDel(source, ci, params[2]);
-			else
-			{
-				success = false;
-				this->OnSyntaxError(source, "");
-			}
-			if (success)
-				Log(IsFounder(u, ci) ? LOG_COMMAND : LOG_OVERRIDE, u, this, ci) << " to " << params[1] << " a message";
-		}
-		else
-			source.Reply(ACCESS_DENIED);
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Controls what messages will be sent to users when they join the channel."));
-		return true;
-	}
-};
-
-class CSEntryMessage : public Module
-{
-	SerializeType entrymsg_type;
-	CommandEntryMessage commandentrymsg;
-
- public:
-	CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), entrymsg_type("EntryMsg", EntryMsg::unserialize), commandentrymsg(this)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation i[] = { I_OnReload, I_OnJoinChannel };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-
-		this->OnReload();
-	}
-
-	void OnJoinChannel(User *u, Channel *c)
-	{
-		if (u && c && c->ci && u->server->IsSynced())
-		{
-			EntryMessageList *messages = c->ci->GetExt<EntryMessageList *>("cs_entrymsg");
-
-			if (messages != NULL)
-				for (unsigned i = 0; i < messages->size(); ++i)
-					u->SendMessage(c->ci->WhoSends(), "[%s] %s", c->ci->name.c_str(), (*messages)[i].message.c_str());
-		}
-	}
-		
-	void OnReload()
-	{
-		ConfigReader config;
-		MaxEntries = config.ReadInteger("cs_entrymsg", "maxentries", "5", 0, true);
-	}
-};
-
-MODULE_INIT(CSEntryMessage)

modules/commands/cs_flags.cpp

@@ -1,419 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-static std::map<Anope::string, char> defaultFlags;
-
-class FlagsChanAccess : public ChanAccess
-{
- public:
-	std::set<char> flags;
-
- 	FlagsChanAccess(AccessProvider *p) : ChanAccess(p)
-	{
-	}
-
-	bool HasPriv(const Anope::string &priv) const
-	{
-		std::map<Anope::string, char>::iterator it = defaultFlags.find(priv);
-		if (it != defaultFlags.end() && this->flags.count(it->second) > 0)
-			return true;
-		return false;
-	}
-
-	Anope::string Serialize()
-	{
-		return Anope::string(this->flags.begin(), this->flags.end());
-	}
-
-	void Unserialize(const Anope::string &data)
-	{
-		for (unsigned i = data.length(); i > 0; --i)
-			this->flags.insert(data[i - 1]);
-	}
-
-	static Anope::string DetermineFlags(ChanAccess *access)
-	{
-		if (access->provider->name == "access/flags")
-			return access->Serialize();
-		
-		std::set<char> buffer;
-
-		for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it)
-			if (access->HasPriv(it->first))
-				buffer.insert(it->second);
-
-		return Anope::string(buffer.begin(), buffer.end());
-	}
-};
-
-class FlagsAccessProvider : public AccessProvider
-{
- public:
-	FlagsAccessProvider(Module *o) : AccessProvider(o, "access/flags")
-	{
-	}
-
-	ChanAccess *Create()
-	{
-		return new FlagsChanAccess(this);
-	}
-};
-
-class CommandCSFlags : public Command
-{
-	void DoModify(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		Anope::string mask = params.size() > 2 ? params[2] : "";
-		Anope::string flags = params.size() > 3 ? params[3] : "";
-
-		if (flags.empty())
-		{
-			this->OnSyntaxError(source, "");
-			return;
-		}
-
-		AccessGroup u_access = ci->AccessFor(u);
-
-		if (mask.find_first_of("!*@") == Anope::string::npos && findnick(mask) == NULL)
-			mask += "!*@*";
-
-		ChanAccess *current = NULL;
-		std::set<char> current_flags;
-		for (unsigned i = ci->GetAccessCount(); i > 0; --i)
-		{
-			ChanAccess *access = ci->GetAccess(i - 1);
-			if (mask.equals_ci(access->mask))
-			{
-				current = access;
-				Anope::string cur_flags = FlagsChanAccess::DetermineFlags(access);
-				for (unsigned j = cur_flags.length(); j > 0; --j)
-					current_flags.insert(cur_flags[j - 1]);
-				break;
-			}
-		}
-
-		if (ci->GetAccessCount() >= Config->CSAccessMax)
-		{
-			source.Reply(_("Sorry, you can only have %d access entries on a channel."), Config->CSAccessMax);
-			return;
-		}
-
-		bool override = false;
-		int add = -1;
-		for (size_t i = 0; i < flags.length(); ++i)
-		{
-			char f = flags[i];
-			switch (f)
-			{
-				case '+':
-					add = 1;
-					break;
-				case '-':
-					add = 0;
-					break;
-				case '*':
-					if (add == -1)
-						break;
-					for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it)
-					{
-						if (!u_access.HasPriv(it->first))
-						{
-							if (u->HasPriv("chanserv/access/modify"))
-								override = true;
-							else
-								continue;
-						}
-						if (add == 1)
-							current_flags.insert(it->second);
-						else if (add == 0)
-							current_flags.erase(it->second);
-					}
-					break;
-				default:
-					if (add == -1)
-						break;
-					for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it)
-					{
-						if (f != it->second)
-							continue;
-						else if (!u_access.HasPriv(it->first))
-						{
-							if (u->HasPriv("chanserv/access/modify"))
-								override = true;
-							else
-							{
-								source.Reply(_("You can not set the \002%c\002 flag."), f);
-								continue;
-							}
-						}
-						if (add == 1)
-							current_flags.insert(f);
-						else if (add == 0)
-							current_flags.erase(f);
-						break;
-					}
-			}
-		}
-		if (current_flags.empty())
-		{
-			if (current != NULL)
-			{
-				FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, current));
-				ci->EraseAccess(current);
-				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to delete " << mask;
-				source.Reply(_("\002%s\002 removed from the %s access list."), mask.c_str(), ci->name.c_str());
-			}
-			else
-			{
-				source.Reply(_("Insufficient flags given"));
-			}
-			return;
-		}
-
-		service_reference<AccessProvider> provider("AccessProvider", "access/flags");
-		if (!provider)
-			return;
-		FlagsChanAccess *access = debug_cast<FlagsChanAccess *>(provider->Create());
-		access->ci = ci;
-		access->mask = mask;
-		access->creator = u->nick;
-		access->last_seen = current ? current->last_seen : 0;
-		access->created = Anope::CurTime;
-		access->flags = current_flags;
-
-		if (current != NULL)
-			ci->EraseAccess(current);
-
-		ci->AddAccess(access);
-
-		FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, access));
-
-		Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to modify " << mask << "'s flags to " << access->Serialize();
-		source.Reply(_("Access for \002%s\002 on %s set to +\002%s\002"), access->mask.c_str(), ci->name.c_str(), access->Serialize().c_str());
-
-		return;
-	}
-
-	void DoList(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &arg = params.size() > 2 ? params[2] : "";
-
-		if (!ci->GetAccessCount())
-		{
-			source.Reply(_("%s access list is empty."), ci->name.c_str());
-			return;
-		}
-
-		ListFormatter list;
-
-		list.addColumn("Number").addColumn("Mask").addColumn("Flags").addColumn("Creator").addColumn("Created");
-
-		unsigned count = 0;
-		for (unsigned i = 0, end = ci->GetAccessCount(); i < end; ++i)
-		{
-			ChanAccess *access = ci->GetAccess(i);
-			const Anope::string &flags = FlagsChanAccess::DetermineFlags(access);
-
-			if (!arg.empty())
-			{
-				if (arg[0] == '+')
-				{
-					bool pass = true;
-					for (size_t j = 1; j < arg.length(); ++j)
-						if (flags.find(arg[j]) == Anope::string::npos)
-							pass = false;
-					if (pass == false)
-						continue;
-				}
-				else if (!Anope::Match(access->mask, arg))
-					continue;
-			}
-
-			ListFormatter::ListEntry entry;
-			++count;
-			entry["Number"] = stringify(i + 1);
-			entry["Mask"] = access->mask;
-			entry["Flags"] = FlagsChanAccess::DetermineFlags(access);
-			entry["Creator"] = access->creator;
-			entry["Created"] = do_strftime(access->created, source.u->Account(), true);
-			list.addEntry(entry);
-		}
-
-		if (list.isEmpty())
-			source.Reply(_("No matching entries on %s access list."), ci->name.c_str());
-		else
-		{
-			std::vector<Anope::string> replies;
-			list.Process(replies);
-
-			source.Reply(_("Flags list for %s"), ci->name.c_str());
-			for (unsigned i = 0; i < replies.size(); ++i)
-				source.Reply(replies[i]);
-			if (count == ci->GetAccessCount())
-				source.Reply(_("End of access list."));
-			else
-				source.Reply(_("End of access list - %d/%d entries shown."), count, ci->GetAccessCount());
-		}
-	}
-
-	void DoClear(CommandSource &source, ChannelInfo *ci)
-	{
-		User *u = source.u;
-
-		if (!IsFounder(u, ci) && !u->HasPriv("chanserv/access/modify"))
-			source.Reply(ACCESS_DENIED);
-		else
-		{
-			ci->ClearAccess();
-
-			FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u));
-
-			source.Reply(_("Channel %s access list has been cleared."), ci->name.c_str());
-
-			bool override = !IsFounder(u, ci);
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to clear the access list";
-		}
-
-		return;
-	}
-
- public:
-	CommandCSFlags(Module *creator) : Command(creator, "chanserv/flags", 2, 4)
-	{
-		this->SetDesc(_("Modify the list of privileged users"));
-		this->SetSyntax(_("\037channel\037 MODIFY \037mask\037 \037changes\037"));
-		this->SetSyntax(_("\037channel\037 LIST [\037mask\037 | +\037flags\037]"));
-		this->SetSyntax(_("\037channel\037 CLEAR\002"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-		const Anope::string &cmd = params[1];
-
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(chan);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
-			return;
-		}
-
-		bool is_list = cmd.equals_ci("LIST");
-		bool has_access = false;
-		if (u->HasPriv("chanserv/access/modify"))
-			has_access = true;
-		else if (is_list && ci->AccessFor(u).HasPriv("ACCESS_LIST"))
-			has_access = true;
-		else if (ci->AccessFor(u).HasPriv("ACCESS_CHANGE"))
-			has_access = true;
-
-		if (!has_access)
-			source.Reply(ACCESS_DENIED);
-		else if (readonly && !is_list)
-			source.Reply(_("Sorry, channel access list modification is temporarily disabled."));
-		else if (cmd.equals_ci("MODIFY"))
-			this->DoModify(source, ci, params);
-		else if (cmd.equals_ci("LIST"))
-			this->DoList(source, ci, params);
-		else if (cmd.equals_ci("CLEAR"))
-			this->DoClear(source, ci);
-		else
-			this->OnSyntaxError(source, cmd);
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("%s is another way to modify the channel access list, similar to\n"
-				"the XOP and ACCESS methods."), source.command.c_str());
-		source.Reply(" ");
-		source.Reply(_("The MODIFY command allows you to modify the access list. If mask is\n"
-				"not already on the access list is it added, then the changes are applied.\n"
-				"If the mask has no more flags, then the mask is removed from the access list.\n"
-				"Additionally, you may use +* or -* to add or remove all flags, respectively. You are\n"
-				"only able to modify the access list if you have the proper permission on the channel,\n"
-				"and even then you can only give other people access to up what you already have."));
-		source.Reply(" ");
-		source.Reply(_("The LIST command allows you to list existing entries on the channel access list.\n"
-				"If a mask is given, the mask is wildcard matched against all existing entries on the\n"
-				"access list, and only those entries are returned. If a set of flags is given, only those\n"
-				"on the access list with the specified flags are returned."));
-		source.Reply(" ");
-		source.Reply(_("The CLEAR command clears the channel access list, which requires channel founder."));
-		source.Reply(" ");
-		source.Reply(_("The available flags are:"));
-
-		typedef std::multimap<char, Anope::string, ci::less> reverse_map;
-		reverse_map reverse;
-		for (std::map<Anope::string, char>::iterator it = defaultFlags.begin(), it_end = defaultFlags.end(); it != it_end; ++it)
-			reverse.insert(std::make_pair(it->second, it->first));
-
-		for (reverse_map::iterator it = reverse.begin(), it_end = reverse.end(); it != it_end; ++it)
-		{
-			Privilege *p = PrivilegeManager::FindPrivilege(it->second);
-			if (p == NULL)
-				continue;
-			source.Reply("  %c - %s", it->first, translate(source.u->Account(), p->desc.c_str()));
-		}
-
-		return true;
-	}
-};
-
-class CSFlags : public Module
-{
-	FlagsAccessProvider accessprovider;
-	CommandCSFlags commandcsflags;
-
- public:
-	CSFlags(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		accessprovider(this), commandcsflags(this)
-	{
-		this->SetAuthor("Anope");
-
-
-		Implementation i[] = { I_OnReload };
-		ModuleManager::Attach(i, this, 1);
-
-		this->OnReload();
-	}
-
-	void OnReload()
-	{
-		ConfigReader config;
-		defaultFlags.clear();
-
-		for (int i = 0; i < config.Enumerate("privilege"); ++i)
-		{
-			const Anope::string &pname = config.ReadValue("privilege", "name", "", i);
-
-			Privilege *p = PrivilegeManager::FindPrivilege(pname);
-			if (p == NULL)
-				continue;
-
-			const Anope::string &value = config.ReadValue("privilege", "flag", "", i);
-			if (value.empty())
-				continue;
-
-			defaultFlags[p->name] = value[0];
-		}
-	}
-};
-
-MODULE_INIT(CSFlags)

modules/commands/cs_invite.cpp

@@ -1,114 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSInvite : public Command
-{
- public:
-	CommandCSInvite(Module *creator) : Command(creator, "chanserv/invite", 1, 3)
-	{
-		this->SetDesc(_("Invites you or an optionally specified nick into a channel"));
-		this->SetSyntax(_("\037channel\037 [\037nick\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-
-		User *u = source.u;
-		Channel *c = findchan(chan);
-
-		if (!c)
-		{
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
-			return;
-		}
-
-		ChannelInfo *ci = c->ci;
-		if (!ci)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
-			return;
-		}
-
-		if (!ci->AccessFor(u).HasPriv("INVITE") && !u->HasCommand("chanserv/invite"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		User *u2;
-		if (params.size() == 1)
-			u2 = u;
-		else
-		{
-			if (!(u2 = finduser(params[1])))
-			{
-				source.Reply(NICK_X_NOT_IN_USE, params[1].c_str());
-				return;
-			}
-		}
-
-		if (c->FindUser(u2))
-		{
-			if (u2 == u)
-				source.Reply(_("You are already in \002%s\002!"), c->name.c_str());
-			else
-				source.Reply(_("\002%s\002 is already in \002%s\002!"), u2->nick.c_str(), c->name.c_str());
-		}
-		else
-		{
-			bool override = !ci->AccessFor(u).HasPriv("INVITE");
-
-			ircdproto->SendInvite(ci->WhoSends(), chan, u2->nick);
-			if (u2 != u)
-			{
-				source.Reply(_("\002%s\002 has been invited to \002%s\002."), u2->nick.c_str(), c->name.c_str());
-				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << u2->nick;
-			}
-			else
-			{
-				Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci);
-			}
-			u2->SendMessage(ci->WhoSends(), _("You have been invited to \002%s\002."), c->name.c_str());
-		}
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Tells %s to invite you or an optionally specified\n"
-				"nick into the given channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 and above\n"
-				"on the channel."), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CSInvite : public Module
-{
-	CommandCSInvite commandcsinvite;
-
- public:
-	CSInvite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsinvite(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSInvite)

modules/commands/cs_kick.cpp

@@ -1,132 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSKick : public Command
-{
- public:
-	CommandCSKick(Module *creator) : Command(creator, "chanserv/kick", 2, 3)
-	{
-		this->SetDesc(_("Kicks a selected nick from a channel"));
-		this->SetSyntax(_("\037channel\037 \037nick\037 [\037reason\037]"));
-		this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-		const Anope::string &target = params[1];
-		const Anope::string &reason = params.size() > 2 ? params[2] : "Requested";
-
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		Channel *c = findchan(params[0]);
-		User *u2 = finduser(target);
-
-		if (!c)
-		{
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
-			return;
-		}
-		else if (!ci)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
-			return;
-		}
-
-		AccessGroup u_access = ci->AccessFor(u);
-
-		if (!u_access.HasPriv("KICK"))
-			source.Reply(ACCESS_DENIED);
-		else if (u2)
-		{
-			AccessGroup u2_access = ci->AccessFor(u2);
-			if (u != u2 && ci->HasFlag(CI_PEACE) && u2_access >= u_access)
-				source.Reply(ACCESS_DENIED);
-			else if (u2->IsProtected())
-				source.Reply(ACCESS_DENIED);
-			else if (!c->FindUser(u2))
-				source.Reply(NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
-			else
-			{
-				 // XXX
-				Log(LOG_COMMAND, u, this, ci) << "for " << u2->nick;
-
-				if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !u_access.HasPriv("SIGNKICK")))
-					c->Kick(ci->WhoSends(), u2, "%s (%s)", reason.c_str(), u->nick.c_str());
-				else
-					c->Kick(ci->WhoSends(), u2, "%s", reason.c_str());
-			}
-		}
-		else if (u_access.HasPriv("FOUNDER"))
-		{
-			Log(LOG_COMMAND, u, this, ci) << "for " << target;
-
-			int matched = 0, kicked = 0;
-			for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end;)
-			{
-				UserContainer *uc = *it++;
-
-				if (Anope::Match(uc->user->nick, target) || Anope::Match(uc->user->GetDisplayedMask(), target))
-				{
-					++matched;
-
-					AccessGroup u2_access = ci->AccessFor(uc->user);
-					if (u != uc->user && ci->HasFlag(CI_PEACE) && u2_access >= u_access)
-						continue;
-					else if (uc->user->IsProtected())
-						continue;
-
-					++kicked;
-					if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !u_access.HasPriv("SIGNKICK")))
-						c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s) (%s)", reason.c_str(), target.c_str(), u->nick.c_str());
-					else
-						c->Kick(ci->WhoSends(), uc->user, "%s (Matches %s)", reason.c_str(), target.c_str());
-				}
-			}
-
-			if (matched)
-				source.Reply(_("Kicked %d/%d users matching %s from %s."), kicked, matched, target.c_str(), c->name.c_str());
-			else
-				source.Reply(_("No users on %s match %s."), c->name.c_str(), target.c_str());
-		}
-		else
-			source.Reply(NICK_X_NOT_IN_USE, target.c_str());
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Kicks a selected nick on a channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel. Channel founders may use masks too."));
-		return true;
-	}
-};
-
-class CSKick : public Module
-{
-	CommandCSKick commandcskick;
-
- public:
-	CSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcskick(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSKick)

modules/commands/cs_log.cpp

@@ -1,219 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-#include "memoserv.h"
-
-class CommandCSLog : public Command
-{
-public:
-	CommandCSLog(Module *creator) : Command(creator, "chanserv/log", 1, 4)
-	{
-		this->SetDesc(_("Configures channel logging settings"));
-		this->SetSyntax(_("\037channel\037"));
-		this->SetSyntax(_("\037channel\037 \037command\037 \037method\037 [\037status\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &channel = params[0];
-
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(channel);
-		if (ci == NULL)
-			source.Reply(CHAN_X_NOT_REGISTERED, channel.c_str());
-		else if (!ci->AccessFor(u).HasPriv("SET") && !u->HasPriv("chanserv/set"))
-			source.Reply(ACCESS_DENIED);
-		else if (params.size() == 1)
-		{
-			if (ci->log_settings.empty())
-				source.Reply(_("There currently are no logging configurations for %s."), ci->name.c_str());
-			else
-			{
-				ListFormatter list;
-				list.addColumn("Number").addColumn("Service").addColumn("Command").addColumn("Method").addColumn("");
-
-				for (unsigned i = 0; i < ci->log_settings.size(); ++i)
-				{
-					LogSetting &log = ci->log_settings[i];
-
-					ListFormatter::ListEntry entry;
-					entry["Number"] = stringify(i + 1);
-					entry["Service"] = log.command_service;
-					entry["Command"] = log.command_name;
-					entry["Method"] = log.method;
-					entry[""] = log.extra;
-					list.addEntry(entry);
-				}
-
-				source.Reply(_("Log list for %s:"), ci->name.c_str());
-
-				std::vector<Anope::string> replies;
-				list.Process(replies);
-
-				for (unsigned i = 0; i < replies.size(); ++i)
-					source.Reply(replies[i]);
-			}
-		}
-		else if (params.size() > 2)
-		{
-			const Anope::string &command = params[1];
-			const Anope::string &method = params[2];
-			const Anope::string &extra = params.size() > 3 ? params[3] : "";
-
-			size_t sl = command.find('/');
-			if (sl == Anope::string::npos)
-			{
-				source.Reply(_("%s is not a valid command."), command.c_str());
-				return;
-			}
-
-			Anope::string service = command.substr(0, sl),
-				command_name = command.substr(sl + 1);
-			BotInfo *bi = findbot(service);
-
-			if (bi == NULL || bi->commands.count(command_name) == 0)
-			{
-				source.Reply(_("%s is not a valid command."), command.c_str());
-				return;
-			}
-
-			service_reference<Command> c_service("Command", bi->commands[command_name].name);
-			if (!c_service)
-			{
-				source.Reply(_("%s is not a valid command."), command.c_str());
-				return;
-			}
-
-			if (!method.equals_ci("MESSAGE") && !method.equals_ci("NOTICE") && !method.equals_ci("MEMO"))
-			{
-				source.Reply(_("%s is not a valid logging method."), method.c_str());
-				return;
-			}
-
-			for (unsigned i = 0; i < extra.length(); ++i)
-				if (ModeManager::GetStatusChar(extra[i]) == 0)
-				{
-					source.Reply(_("%c is an unknown status mode."), extra[i]);
-					return;
-				}
-
-			bool override = !ci->AccessFor(u).HasPriv("SET");
-
-			for (unsigned i = ci->log_settings.size(); i > 0; --i)
-			{
-				LogSetting &log = ci->log_settings[i - 1];
-
-				if (log.service_name == bi->commands[command_name].name && log.method.equals_ci(method))
-				{
-					if (log.extra == extra)
-					{
-						ci->log_settings.erase(ci->log_settings.begin() + i - 1);
-						Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to remove logging for " << command << " with method " << method << (extra == "" ? "" : " ") << extra;
-						source.Reply(_("Logging for command %s on %s with log method %s%s%s has been removed."), command_name.c_str(), bi->nick.c_str(), method.c_str(), extra.empty() ? "" : " ", extra.empty() ? "" : extra.c_str());
-					}
-					else
-					{
-						log.extra = extra;
-						Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to change logging for " << command << " to method " << method << (extra == "" ? "" : " ") << extra;
-						source.Reply(_("Logging changed for command %s on %s, now using log method %s%s%s."), command_name.c_str(), bi->nick.c_str(), method.c_str(), extra.empty() ? "" : " ", extra.empty() ? "" : extra.c_str());
-					}
-					return;
-				}
-			}
-
-			LogSetting log;
-			log.ci = ci;
-			log.service_name = bi->commands[command_name].name;
-			log.command_service = bi->nick;
-			log.command_name = command_name;
-			log.method = method;
-			log.extra = extra;
-			log.created = Anope::CurTime;
-			log.creator = u->nick;
-
-			ci->log_settings.push_back(log);
-			Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "to log " << command << " with method " << method << (extra == "" ? "" : " ") << extra;
-
-			source.Reply(_("Logging is now active for command %s on %s, using log method %s%s%s."), command_name.c_str(), bi->nick.c_str(), method.c_str(), extra.empty() ? "" : " ", extra.empty() ? "" : extra.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("The %s command allows users to configure logging settings\n"
-				"for their channel. If no parameters are given this command\n"
-				"lists the current logging methods in place for this channel.\n"
-				" \n"
-				"Otherwise, \037command\037 must be a command name, and \037method\037\n"
-				"is one of the following logging methods:\n"
-				" \n"
-				" MESSAGE [status], NOTICE [status], MEMO\n"
-				" \n"
-				"Which are used to message, notice, and memo the channel respectively.\n"
-				"With MESSAGE or NOTICE you must have a service bot assigned to and joined\n"
-				"to your channel. Status may be a channel status such as @ or +.\n"
-				" \n"
-				"To remove a logging method use the same syntax as you would to add it.\n"
-				" \n"
-				"Example:\n"
-				" %s #anope chanserv/access MESSAGE @%\n"
-				" Would message any channel operators whenever someone used the\n"
-				" ACCESS command on ChanServ on the channel."),
-				source.command.c_str(), source.command.c_str());
-		return true;
-	}
-};
-
-class CSLog : public Module
-{
-	CommandCSLog commandcslog;
-
- public:
-	CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcslog(this)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation i[] = { I_OnLog };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-	}
-
-	void OnLog(Log *l)
-	{
-		if (l->Type != LOG_COMMAND || l->u == NULL || l->c == NULL || l->ci == NULL || !Me || !Me->IsSynced())
-			return;
-
-		for (unsigned i = l->ci->log_settings.size(); i > 0; --i)
-		{
-			LogSetting &log = l->ci->log_settings[i - 1];
-
-			if (log.service_name == l->c->name)
-			{
-				Anope::string buffer = l->u->nick + " used " + log.command_name + " " + l->buf.str();
-
-				if (log.method.equals_ci("MESSAGE") && l->ci->c && l->ci->bi && l->ci->c->FindUser(l->ci->bi) != NULL)
-					ircdproto->SendPrivmsg(l->ci->bi, log.extra + l->ci->c->name, "%s", buffer.c_str());
-				else if (log.method.equals_ci("NOTICE") && l->ci->c && l->ci->bi && l->ci->c->FindUser(l->ci->bi) != NULL)
-					ircdproto->SendNotice(l->ci->bi, log.extra + l->ci->c->name, "%s", buffer.c_str());
-				else if (log.method.equals_ci("MEMO") && memoserv && l->ci->WhoSends() != NULL)
-					memoserv->Send(l->ci->WhoSends()->nick, l->ci->name, buffer, true);
-			}
-		}
-	}
-};
-
-MODULE_INIT(CSLog)

modules/commands/cs_modes.cpp

@@ -1,420 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandModeBase : public Command
-{
-	void do_mode(CommandSource &source, Command *com, ChannelMode *cm, const Anope::string &chan, const Anope::string &nick, bool set, const Anope::string &level, const Anope::string &levelself)
-	{
-		User *u = source.u;
-		User *u2 = finduser(nick);
-		Channel *c = findchan(chan);
-		ChannelInfo *ci = c ? c->ci : NULL;
-
-		bool is_same = u == u2;
-
-		AccessGroup u_access = ci ? ci->AccessFor(u) : AccessGroup(), u2_access = ci && u2 ? ci->AccessFor(u2) : AccessGroup();
-
-		if (!c)
-			source.Reply(CHAN_X_NOT_IN_USE, chan.c_str());
-		else if (!ci)
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
-		else if (!u2)
-			source.Reply(NICK_X_NOT_IN_USE, nick.c_str());
-		else if (is_same ? !ci->AccessFor(u).HasPriv(levelself) : !ci->AccessFor(u).HasPriv(level))
-			source.Reply(ACCESS_DENIED);
-		else if (!set && !is_same && ci->HasFlag(CI_PEACE) && u2_access >= u_access)
-			source.Reply(ACCESS_DENIED);
-		else if (!set && u2->IsProtected() && !is_same)
-			source.Reply(ACCESS_DENIED);
-		else if (!c->FindUser(u2))
-			source.Reply(NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str());
-		else
-		{
-			if (set)
-				c->SetMode(NULL, cm, u2->nick);
-			else
-				c->RemoveMode(NULL, cm, u2->nick);
-
-			Log(LOG_COMMAND, u, com, ci) << "for " << u2->nick;
-		}
-	}
-
- protected:
-	/** do_util: not a command, but does the job of others
-	 * @param source The source of the command
-	 * @param com The command calling this function
-	 * @param cm A channel mode class
-	 * @param chan The channel its being set on
-	 * @param nick The nick the modes being set on
-	 * @param set Is the mode being set or removed
-	 * @param level The access level required to set this mode on someone else
-	 * @param levelself The access level required to set this mode on yourself
-	 */
-	void do_util(CommandSource &source, Command *com, ChannelMode *cm, const Anope::string &chan, const Anope::string &nick, bool set, const Anope::string &level, const Anope::string &levelself)
-	{
-		User *u = source.u;
-
-		if (chan.empty())
-			for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
-				do_mode(source, com, cm, (*it)->chan->name, u->nick, set, level, levelself);
-		else
-			do_mode(source, com, cm, chan, !nick.empty() ? nick : u->nick, set, level, levelself);
-
-		return;
-	}
-
- public:
-	CommandModeBase(Module *creator, const Anope::string &cname) : Command(creator, cname, 0, 2)
-	{
-		this->SetSyntax(_("[\037channel\037] [\037nick\037]"));
-	}
-};
-
-class CommandCSOp : public CommandModeBase
-{
- public:
-	CommandCSOp(Module *creator) : CommandModeBase(creator, "chanserv/op")
-	{
-		this->SetDesc(_("Gives Op status to a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OPDEOP", "OPDEOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Ops a selected nick on a channel. If nick is not given,\n"
-				"it will op you. If channel is not given, it will op you\n"
-				"on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel."));
-		return true;
-	}
-};
-
-class CommandCSDeOp : public CommandModeBase
-{
- public:
-	CommandCSDeOp(Module *creator) : CommandModeBase(creator, "chanserv/deop")
-	{
-		this->SetDesc(_("Deops a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OPDEOP", "OPDEOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply("Deops a selected nick on a channel. If nick is not given,\n"
-				"it will deop you. If channel is not given, it will deop\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel.");
-		return true;
-	}
-};
-
-class CommandCSVoice : public CommandModeBase
-{
- public:
-	CommandCSVoice(Module *creator) : CommandModeBase(creator, "chanserv/voice")
-	{
-		this->SetDesc(_("Voices a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "VOICE", "VOICEME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Voices a selected nick on a channel. If nick is not given,\n"
-				"it will voice you. If channel is not given, it will voice you\n"
-				"on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel, or to VOPs or those with level 3\n"
-				"and above for self voicing."));
-		return true;
-	}
-};
-
-class CommandCSDeVoice : public CommandModeBase
-{
- public:
-	CommandCSDeVoice(Module *creator) : CommandModeBase(creator, "chanserv/devoice")
-	{
-		this->SetDesc(_("Devoices a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE);
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "VOICE", "VOICEME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Devoices a selected nick on a channel. If nick is not given,\n"
-				"it will devoice you. If channel is not given, it will devoice\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs or those with level 5 access\n"
-				"and above on the channel, or to VOPs or those with level 3\n"
-				"and above for self devoicing."));
-		return true;
-	}
-};
-
-class CommandCSHalfOp : public CommandModeBase
-{
- public:
-	CommandCSHalfOp(Module *creator) : CommandModeBase(creator, "chanserv/halfop")
-	{
-		this->SetDesc(_("Halfops a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "HALFOP", "HALFOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Halfops a selected nick on a channel. If nick is not given,\n"
-				"it will halfop you. If channel is not given, it will halfop\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs and those with level 5 access\n"
-				"and above on the channel, or to HOPs or those with level 4\n"
-				"and above for self halfopping."));
-		return true;
-	}
-};
-
-class CommandCSDeHalfOp : public CommandModeBase
-{
- public:
-	CommandCSDeHalfOp(Module *creator) : CommandModeBase(creator, "chanserv/dehalfop")
-	{
-		this->SetDesc(_("Dehalfops a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "HALFOP", "HALFOPME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Dehalfops a selected nick on a channel. If nick is not given,\n"
-				"it will dehalfop you. If channel is not given, it will dehalfop\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to AOPs and those with level 5 access\n"
-				"and above on the channel, or to HOPs or those with level 4\n"
-				"and above for self dehalfopping."));
-		return true;
-	}
-};
-
-class CommandCSProtect : public CommandModeBase
-{
- public:
-	CommandCSProtect(Module *creator) : CommandModeBase(creator, "chanserv/protect")
-	{
-		this->SetDesc(_("Protects a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "PROTECT", "PROTECTME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Protects a selected nick on a channel. If nick is not given,\n"
-				"it will protect you. If channel is not given, it will protect\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to the founder, or to SOPs or those with\n"
-				"level 10 and above on the channel for self protecting."));
-		return true;
-	}
-};
-
-class CommandCSDeProtect : public CommandModeBase
-{
- public:
-	CommandCSDeProtect(Module *creator) : CommandModeBase(creator, "chanserv/deprotect")
-	{
-		this->SetDesc(_("Deprotects a selected nick on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "PROTECT", "PROTECTME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Deprotects a selected nick on a channel. If nick is not given,\n"
-				"it will deprotect you. If channel is not given, it will deprotect\n"
-				"you on every channel.\n"
-				" \n"
-				"By default, limited to the founder, or to SOPs or those with\n"
-				"level 10 and above on the channel for self deprotecting."));
-		return true;
-	}
-};
-
-class CommandCSOwner : public CommandModeBase
-{
- public:
-	CommandCSOwner(Module *creator) : CommandModeBase(module, "chanserv/owner")
-	{
-		this->SetDesc(_("Gives you owner status on channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OWNER", "OWNERME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Gives the selected nick owner status on \002channel\002. If nick is not\n"
-				"given, it will give you owner. If channel is not given, it will\n"
-				"give you owner on every channel.\n"
-				" \n"
-				"Limited to those with founder access on the channel."));
-		return true;
-	}
-};
-
-class CommandCSDeOwner : public CommandModeBase
-{
- public:
-	CommandCSDeOwner(Module *creator) : CommandModeBase(creator, "chanserv/deowner")
-	{
-		this->SetDesc(_("Removes your owner status on a channel"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER);
-
-		if (!cm)
-			return;
-
-		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OWNER", "OWNERME");
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Removes owner status from the selected nick on \002channel\002. If nick\n"
-				"is not given, it will deowner you. If channel is not given, it will\n"
-				"deowner you on every channel.\n"
-				" \n"
-				"Limited to those with founder access on the channel."));
-		return true;
-	}
-};
-
-class CSModes : public Module
-{
-	CommandCSOwner commandcsowner;
-	CommandCSDeOwner commandcsdeowner;
-	CommandCSProtect commandcsprotect;
-	CommandCSDeProtect commandcsdeprotect;
-	CommandCSOp commandcsop;
-	CommandCSDeOp commandcsdeop;
-	CommandCSHalfOp commandcshalfop;
-	CommandCSDeHalfOp commandcsdehalfop;
-	CommandCSVoice commandcsvoice;
-	CommandCSDeVoice commandcsdevoice;
-
- public:
-	CSModes(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcsowner(this), commandcsdeowner(this), commandcsprotect(this), commandcsdeprotect(this),
-		commandcsop(this), commandcsdeop(this), commandcshalfop(this), commandcsdehalfop(this),
-		commandcsvoice(this), commandcsdevoice(this)
-	{
-		this->SetAuthor("Anope");
-
-		
-	}
-};
-
-MODULE_INIT(CSModes)

modules/commands/cs_saset.cpp

@@ -1,73 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSASet : public Command
-{
- public:
-	CommandCSSASet(Module *creator) : Command(creator, "chanserv/saset", 2, 3)
-	{
-		this->SetDesc(_("Forcefully set channel options and information"));
-		this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		this->OnSyntaxError(source, "");
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Allows Services Operators to forcefully change settings\n"
-				"on channels.\n"
-				" \n"
-				"Available options:"));
-		Anope::string this_name = source.command;
-		for (BotInfo::command_map::iterator it = source.owner->commands.begin(), it_end = source.owner->commands.end(); it != it_end; ++it)
-		{
-			const Anope::string &c_name = it->first;
-			CommandInfo &info = it->second;
-			if (c_name.find_ci(this_name + " ") == 0)
-			{
-				service_reference<Command> command("Command", info.name);
-				if (command)
-				{
-					source.command = it->first;
-					command->OnServHelp(source);
-				}
-			}
-		}
-		source.Reply(_("Type \002%s%s HELP SASET \037option\037\002 for more information on a\n"
-			"particular option."), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CSSASet : public Module
-{
-	CommandCSSASet commandcssaset;
-
- public:
-	CSSASet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssaset(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSASet)

modules/commands/cs_seen.cpp

@@ -1,396 +0,0 @@
-/* cs_seen: provides a seen command by tracking all users
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-
-#include "module.h"
-
-enum TypeInfo
-{
-	NEW, NICK_TO, NICK_FROM, JOIN, PART, QUIT, KICK
-};
-
-struct SeenInfo;
-typedef Anope::insensitive_map<SeenInfo *> database_map;
-database_map database;
-
-struct SeenInfo : Serializable
-{
-	Anope::string nick;
-	Anope::string vhost;
-	TypeInfo type;
-	Anope::string nick2;    // for nickchanges and kicks
-	Anope::string channel;  // for join/part/kick
-	Anope::string message;  // for part/kick/quit
-	time_t last;            // the time when the user was last seen
-
-	SeenInfo()
-	{
-	}
-
-	Anope::string serialize_name() const
-	{
-		return "SeenInfo";
-	}
-
-	serialized_data serialize()
-	{
-		serialized_data data;
-
-		data["nick"] << nick;
-		data["vhost"] << vhost;
-		data["type"] << type;
-		data["nick2"] << nick2;
-		data["channel"] << channel;
-		data["message"] << message;
-		data["last"].setType(Serialize::DT_INT) << last;
-
-		return data;
-	}
-
-	static void unserialize(serialized_data &data)
-	{
-		SeenInfo *s = new SeenInfo();
-
-		data["nick"] >> s->nick;
-		data["vhost"] >> s->vhost;
-		unsigned int n;
-		data["type"] >> n;
-		s->type = static_cast<TypeInfo>(n);
-		data["nick2"] >> s->nick2;
-		data["channel"] >> s->channel;
-		data["message"] >> s->message;
-		data["last"] >> s->last;
-
-		database[s->nick] = s;
-	}
-};
-
-static time_t purgetime;
-static time_t expiretimeout;
-
-static SeenInfo *FindInfo(const Anope::string &nick)
-{
-	database_map::iterator iter = database.find(nick);
-	if (iter != database.end())
-		return iter->second;
-	return NULL;
-}
-
-static bool ShouldHide(const Anope::string &channel, User *u)
-{
-	Channel *targetchan = findchan(channel);
-	ChannelInfo *targetchan_ci = targetchan ? targetchan->ci : cs_findchan(channel);
-
-	if (targetchan && targetchan->HasMode(CMODE_SECRET))
-		return true;
-	else if (targetchan_ci && targetchan_ci->HasFlag(CI_PRIVATE))
-		return true;
-	else if (u && u->HasMode(UMODE_PRIV))
-		return true;
-	return false;
-}
-
-class CommandOSSeen : public Command
-{
- public:
-	CommandOSSeen(Module *creator) : Command(creator, "operserv/seen", 1, 2)
-	{
-		this->SetDesc(_("Statistics and maintenance for seen data"));
-		this->SetSyntax(_("\037STATS\037"));
-		this->SetSyntax(_("\037CLEAR\037 \037time\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		if (params[0].equals_ci("STATS"))
-		{
-			size_t mem_counter;
-			mem_counter = sizeof(database_map);
-			for (database_map::iterator it = database.begin(), it_end = database.end(); it != it_end; ++it)
-			{
-				mem_counter += (5 * sizeof(Anope::string)) + sizeof(TypeInfo) + sizeof(time_t);
-				mem_counter += it->first.capacity();
-				mem_counter += it->second->vhost.capacity();
-				mem_counter += it->second->nick2.capacity();
-				mem_counter += it->second->channel.capacity();
-				mem_counter += it->second->message.capacity();
-			}
-			source.Reply(_("%lu nicks are stored in the database, using %.2Lf kB of memory"), database.size(), static_cast<long double>(mem_counter) / 1024);
-		}
-		else if (params[0].equals_ci("CLEAR"))
-		{
-			time_t time = 0;
-			if ((params.size() < 2) || (0 >= (time = dotime(params[1]))))
-			{
-				this->OnSyntaxError(source, params[0]);
-				return;
-			}
-			time = Anope::CurTime - time;
-			database_map::iterator buf;
-			size_t counter = 0;
-			for (database_map::iterator it = database.begin(), it_end = database.end(); it != it_end;)
-			{
-				buf = it;
-				++it;
-				if (time < buf->second->last)
-				{
-					Log(LOG_DEBUG) << buf->first << " was last seen " << do_strftime(buf->second->last) << ", deleting entry";
-					database.erase(buf);
-					counter++;
-				}
-			}
-			Log(LOG_ADMIN, source.u, this) << "CLEAR and removed " << counter << " nicks that were added after " << do_strftime(time, NULL, true);
-			source.Reply(_("Database cleared, removed %lu nicks that were added after %s"), counter, do_strftime(time, source.u->Account(), true).c_str());
-		}
-		else
-			this->SendSyntax(source);
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("The \002STATS\002 command prints out statistics about stored nicks and memory usage."));
-		source.Reply(_("The \002CLEAR\002 command lets you clean the database by removing all entries from the\n"
-				"entries from the database that were added within \037time\037.\n"
-				" \n"
-				"Example:\n"
-				"%s CLEAR 30m\n"
-				"will remove all entries that were added within the last 30 minutes."), source.command.c_str());
-		return true;
-	}
-};
-
-class CommandSeen : public Command
-{
- public:
-	CommandSeen(Module *creator) : Command(creator, "chanserv/seen", 1, 2)
-	{
-		this->SetFlag(CFLAG_STRIP_CHANNEL);
-		this->SetDesc(_("Tells you about the last time a user was seen"));
-		this->SetSyntax(_("\037nick\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &target = params[0];
-		User *u = source.u;
-
-		if (target.length() > Config->NickLen)
-		{
-			source.Reply(_("Nick too long, max length is %u chars"), Config->NickLen);
-			return;
-		}
-
-		if (findbot(target) != NULL)
-		{
-			source.Reply(_("%s is a client on services."), target.c_str());
-			return;
-		}
-
-		if (target.equals_ci(u->nick))
-		{
-			source.Reply(_("You might see yourself in the mirror, %s."), u->nick.c_str());
-			return;
-		}
-
-		SeenInfo *info = FindInfo(target);
-		if (!info)
-		{
-			source.Reply(_("Sorry, I have not seen %s."), target.c_str());
-			return;
-		}
-
-		User *u2 = finduser(target);
-		Anope::string onlinestatus;
-		if (u2)
-			onlinestatus = ".";
-		else
-			onlinestatus = Anope::printf(_(" but %s mysteriously dematerialized."), target.c_str());
-
-		Anope::string timebuf = duration(Anope::CurTime - info->last, u->Account());
-		Anope::string timebuf2 = do_strftime(info->last, u->Account(), true);
-
-		if (info->type == NEW)
-		{
-			source.Reply(_("%s (%s) was last seen connecting %s ago (%s)%s"),
-				target.c_str(), info->vhost.c_str(), timebuf.c_str(), timebuf2.c_str(), onlinestatus.c_str());
-		}
-		else if (info->type == NICK_TO)
-		{
-			u2 = finduser(info->nick2);
-			if (u2)
-				onlinestatus = Anope::printf( _(". %s is still online."), u2->nick.c_str());
-			else
-				onlinestatus = Anope::printf(_(", but %s mysteriously dematerialized"), info->nick2.c_str());
-
-			source.Reply(_("%s (%s) was last seen changing nick to %s %s ago%s"),
-				target.c_str(), info->vhost.c_str(), info->nick2.c_str(), timebuf.c_str(), onlinestatus.c_str());
-		}
-		else if (info->type == NICK_FROM)
-		{
-			source.Reply(_("%s (%s) was last seen changing nick from %s to %s %s ago%s"),
-				target.c_str(), info->vhost.c_str(), info->nick2.c_str(), target.c_str(), timebuf.c_str(), onlinestatus.c_str());
-		}
-		else if (info->type == JOIN)
-		{
-			if (ShouldHide(info->channel, u2))
-				source.Reply(_("%s (%s) was last seen joining a secret channel %s ago%s"),
-					target.c_str(), info->vhost.c_str(), timebuf.c_str(), onlinestatus.c_str());
-			else
-				source.Reply(_("%s (%s) was last seen joining %s %s ago%s"),
-					target.c_str(), info->vhost.c_str(), info->channel.c_str(), timebuf.c_str(), onlinestatus.c_str());
-		}
-		else if (info->type == PART)
-		{
-			if (ShouldHide(info->channel, u2))
-				source.Reply(_("%s (%s) was last seen parting a secret channel %s ago%s"),
-					target.c_str(), info->vhost.c_str(), timebuf.c_str(), onlinestatus.c_str());
-			else
-				source.Reply(_("%s (%s) was last seen parting %s %s ago%s"),
-					target.c_str(), info->vhost.c_str(), info->channel.c_str(), timebuf.c_str(), onlinestatus.c_str());
-		}
-		else if (info->type == QUIT)
-		{
-			source.Reply(_("%s (%s) was last seen quitting (%s) %s ago (%s)."),
-					target.c_str(), info->vhost.c_str(), info->message.c_str(), timebuf.c_str(), timebuf2.c_str());
-		}
-		else if (info->type == KICK)
-		{
-			if (ShouldHide(info->channel, u2))
-				source.Reply(_("%s (%s) was kicked from a secret channel %s ago%s"),
-					target.c_str(), info->vhost.c_str(), timebuf.c_str(), onlinestatus.c_str());
-			else
-				source.Reply(_("%s (%s) was kicked from %s (\"%s\") %s ago%s"),
-					target.c_str(), info->vhost.c_str(), info->channel.c_str(), info->message.c_str(), timebuf.c_str(), onlinestatus.c_str());
-		}
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Checks for the last time \037nick\037 was seen joining, leaving,\n"
-				"or changing nick on the network and tells you when and, depending\n"
-				"on channel or user settings, where it was."));
-		return true;
-	}
-};
-
-class DataBasePurger : public CallBack
-{
- public:
-	DataBasePurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { }
-
-	void Tick(time_t)
-	{
-		size_t previous_size = database.size();
-		for (database_map::iterator it = database.begin(), it_end = database.end(); it != it_end;)
-		{
-			database_map::iterator cur = it;
-			++it;
-
-			if ((Anope::CurTime - cur->second->last) > purgetime)
-			{
-				Log(LOG_DEBUG) << cur->first << " was last seen " << do_strftime(cur->second->last) << ", purging entry";
-				delete cur->second;
-				database.erase(cur);
-			}
-		}
-		Log(LOG_DEBUG) << "cs_seen: Purged Database, checked " << previous_size << " nicks and removed " << (previous_size - database.size()) << " old entries.";
-	}
-};
-
-class CSSeen : public Module
-{
-	SerializeType seeninfo_type;
-	CommandSeen commandseen;
-	CommandOSSeen commandosseen;
-	DataBasePurger purger;
- public:
-	CSSeen(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), seeninfo_type("SeenInfo", SeenInfo::unserialize), commandseen(this), commandosseen(this), purger(this)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation eventlist[] =  { I_OnReload,
-						I_OnUserConnect,
-						I_OnUserNickChange,
-						I_OnUserQuit,
-						I_OnJoinChannel,
-						I_OnPartChannel,
-						I_OnUserKicked };
-		ModuleManager::Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
-		OnReload();
-	}
-
-	void OnReload()
-	{
-		ConfigReader config;
-		purgetime = dotime(config.ReadValue("cs_seen", "purgetime", "30d", 0));
-		expiretimeout = dotime(config.ReadValue("cs_seen", "expiretimeout", "1d", 0));
-
-		if (purger.GetSecs() != expiretimeout)
-			purger.SetSecs(expiretimeout);
-	}
-
-	void OnUserConnect(User *u)
-	{
-		UpdateUser(u, NEW, u->nick, "", "", "");
-	}
-
-	void OnUserNickChange(User *u, const Anope::string &oldnick)
-	{
-		UpdateUser(u, NICK_TO, oldnick, u->nick, "", "");
-		UpdateUser(u, NICK_FROM, u->nick, oldnick, "", "");
-	}
-
-	void OnUserQuit(User *u, const Anope::string &msg)
-	{
-		UpdateUser(u, QUIT, u->nick, "", "", msg);
-	}
-
-	void OnJoinChannel(User *u, Channel *c)
-	{
-		UpdateUser(u, JOIN, u->nick, "", c->name, "");
-	}
-
-	void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg)
-	{
-		UpdateUser(u, PART, u->nick, "", channel, msg);
-	}
-
-	void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg)
-	{
-		UpdateUser(target, KICK, target->nick, source, c->name, msg);
-	}
-
-	void UpdateUser(const User *u, const TypeInfo Type, const Anope::string &nick, const Anope::string &nick2, const Anope::string &channel, const Anope::string &message)
-	{
-		SeenInfo *info = FindInfo(nick);
-		if (!info)
-		{
-			info = new SeenInfo;
-			database.insert(std::pair<Anope::string, SeenInfo *>(nick, info));
-		}
-		info->nick = nick;
-		info->vhost = u->GetVIdent() + "@" + u->GetDisplayedHost();
-		info->type = Type;
-		info->last = Anope::CurTime;
-		info->nick2 = nick2;
-		info->channel = channel;
-		info->message = message;
-	}
-};
-
-MODULE_INIT(CSSeen)

modules/commands/cs_set.cpp

@@ -1,73 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSet : public Command
-{
- public:
-	CommandCSSet(Module *creator) : Command(creator, "chanserv/set", 2, 3)
-	{
-		this->SetDesc(_("Set channel options and information"));
-		this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		this->OnSyntaxError(source, "");
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Allows the channel founder to set various channel options\n"
-			"and other information.\n"
-			" \n"
-			"Available options:"));
-		Anope::string this_name = source.command;
-		for (BotInfo::command_map::iterator it = source.owner->commands.begin(), it_end = source.owner->commands.end(); it != it_end; ++it)
-		{
-			const Anope::string &c_name = it->first;
-			CommandInfo &info = it->second;
-			if (c_name.find_ci(this_name + " ") == 0)
-			{
-				service_reference<Command> command("Command", info.name);
-				if (command)
-				{
-					source.command = it->first;
-					command->OnServHelp(source);
-				}
-			}
-		}
-		source.Reply(_("Type \002%s%s HELP SET \037option\037\002 for more information on a\n"
-				"particular option."), Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CSSet : public Module
-{
-	CommandCSSet commandcsset;
-
- public:
-	CSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcsset(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSet)

modules/commands/cs_set_description.cpp

@@ -1,87 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetDescription : public Command
-{
- public:
-	CommandCSSetDescription(Module *creator, const Anope::string &cname = "chanserv/set/description") : Command(creator, cname, 1, 2)
-	{
-		this->SetDesc(_("Set the channel description"));
-		this->SetSyntax(_("\037channel\037 [\037description\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params.size() > 1)
-		{
-			ci->desc = params[1];
-			source.Reply(_("Description of %s changed to \002%s\002."), ci->name.c_str(), ci->desc.c_str());
-		}
-		else
-		{
-			ci->desc.clear();
-			source.Reply(_("Description of %s unset."), ci->name.c_str());
-		}
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Sets the description for the channel, which shows up with\n"
-				"the \002LIST\002 and \002INFO\002 commands."), this->name.c_str());
-		return true;
-	}
-};
-
-class CommandCSSASetDescription : public CommandCSSetDescription
-{
- public:
-	CommandCSSASetDescription(Module *creator) : CommandCSSetDescription(creator, "chanserv/saset/description")
-	{
-	}
-};
-
-class CSSetDescription : public Module
-{
-	CommandCSSetDescription commandcssetdescription;
-	CommandCSSASetDescription commandcssasetdescription;
-
- public:
-	CSSetDescription(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetdescription(this), commandcssasetdescription(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetDescription)

modules/commands/cs_set_founder.cpp

@@ -1,103 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetFounder : public Command
-{
- public:
-	CommandCSSetFounder(Module *creator, const Anope::string &cname = "chanserv/set/founder") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Set the founder of a channel"));
-		this->SetSyntax(_("\037channel\037 \037nick\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (source.permission.empty() && (ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv("FOUNDER")))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		NickAlias *na = findnick(params[1]);
-
-		if (!na)
-		{
-			source.Reply(NICK_X_NOT_REGISTERED, params[1].c_str());
-			return;
-		}
-
-		NickCore *nc = na->nc;
-		if (Config->CSMaxReg && nc->channelcount >= Config->CSMaxReg && !u->HasPriv("chanserv/no-register-limit"))
-		{
-			source.Reply(_("\002%s\002 has too many channels registered."), na->nick.c_str());
-			return;
-		}
-
-		Log(!source.permission.empty() ? LOG_ADMIN : LOG_COMMAND, u, this, ci) << "to change the founder from " << (ci->GetFounder() ? ci->GetFounder()->display : "(none)") << " to " << nc->display;
-
-		ci->SetFounder(nc);
-
-		source.Reply(_("Founder of \002%s\002 changed to \002%s\002."), ci->name.c_str(), na->nick.c_str());
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Changes the founder of a channel. The new nickname must\n"
-				"be a registered one."), this->name.c_str());
-		return true;
-	}
-};
-
-class CommandCSSASetFounder : public CommandCSSetFounder
-{
- public:
-	CommandCSSASetFounder(Module *creator) : CommandCSSetFounder(creator, "chanserv/saset/founder")
-	{
-	}
-};
-
-class CSSetFounder : public Module
-{
-	CommandCSSetFounder commandcssetfounder;
-	CommandCSSASetFounder commandcssasetfounder;
-
- public:
-	CSSetFounder(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetfounder(this), commandcssasetfounder(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetFounder)

modules/commands/cs_set_misc.cpp

@@ -1,135 +0,0 @@
-/*
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-struct CSMiscData : Anope::string, ExtensibleItem, Serializable
-{
-	ChannelInfo *ci;
-	Anope::string name;
-	Anope::string data;
-
-	CSMiscData(ChannelInfo *c, const Anope::string &n, const Anope::string &d) : ci(c), name(n), data(d)
-	{
-	}
-
-	Anope::string serialize_name() const
-	{
-		return "CSMiscData";
-	}
-
-	serialized_data serialize()
-	{
-		serialized_data sdata;
-
-		sdata["ci"] << this->ci->name;
-		sdata["name"] << this->name;
-		sdata["data"] << this->data;
-
-		return sdata;
-	}
-
-	static void unserialize(serialized_data &data)
-	{
-		ChannelInfo *ci = cs_findchan(data["ci"].astr());
-		if (ci == NULL)
-			return;
-
-		ci->Extend(data["name"].astr(), new CSMiscData(ci, data["name"].astr(), data["data"].astr()));
-	}
-};
-
-static Anope::string GetAttribute(const Anope::string &command)
-{
-	size_t sp = command.rfind(' ');
-	if (sp != Anope::string::npos)
-		return command.substr(sp + 1);
-	return command;
-}
-
-class CommandCSSetMisc : public Command
-{
- public:
-	CommandCSSetMisc(Module *creator, const Anope::string &cname = "chanserv/set/misc") : Command(creator, cname, 1, 2)
-	{
-		this->SetSyntax(_("\037channel\037 [\037parameters\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-		else if (source.permission.empty() && !ci->AccessFor(source.u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		Anope::string scommand = GetAttribute(source.command);
-		Anope::string key = "cs_set_misc:" + scommand;
-		ci->Shrink(key);
-		if (params.size() > 1)
-		{
-			ci->Extend(key, new CSMiscData(ci, key, params[1]));
-			source.Reply(CHAN_SETTING_CHANGED, scommand.c_str(), ci->name.c_str(), params[1].c_str());
-		}
-		else
-			source.Reply(CHAN_SETTING_UNSET, scommand.c_str(), ci->name.c_str());
-	}
-};
-
-class CommandCSSASetMisc : public CommandCSSetMisc
-{
- public:
-	CommandCSSASetMisc(Module *creator) : CommandCSSetMisc(creator, "chanserv/saset/misc")
-	{
-	}
-};
-
-class CSSetMisc : public Module
-{
-	SerializeType csmiscdata_type;
-	CommandCSSetMisc commandcssetmisc;
-	CommandCSSASetMisc commandcssasetmisc;
-
- public:
-	CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		csmiscdata_type("CSMiscData", CSMiscData::unserialize), commandcssetmisc(this), commandcssasetmisc(this)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation i[] = { I_OnChanInfo };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-	}
-
-	void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden)
-	{
-		std::deque<Anope::string> list;
-		ci->GetExtList(list);
-
-		for (unsigned i = 0; i < list.size(); ++i)
-		{
-			if (list[i].find("cs_set_misc:") != 0)
-				continue;
-			
-			CSMiscData *data = ci->GetExt<CSMiscData *>(list[i]);
-			if (data != NULL)
-				info[list[i].substr(12).replace_all_cs("_", " ")] = data->data;
-		}
-	}
-};
-
-MODULE_INIT(CSSetMisc)

modules/commands/cs_set_peace.cpp

@@ -1,91 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetPeace : public Command
-{
- public:
-	CommandCSSetPeace(Module *creator, const Anope::string &cname = "chanserv/set/peace") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Regulate the use of critical commands"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_PEACE);
-			source.Reply(_("Peace option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_PEACE);
-			source.Reply(_("Peace option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "PEACE");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables the \002peace\002 option for a channel.\n"
-				"When \002peace\002 is set, a user won't be able to kick,\n"
-				"ban or remove a channel status of a user that has\n"
-				"a level superior or equal to his via %s commands."), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CommandCSSASetPeace : public CommandCSSetPeace
-{
- public:
-	CommandCSSASetPeace(Module *creator) : CommandCSSetPeace(creator, "chanserv/saset/peace")
-	{
-	}
-};
-
-class CSSetPeace : public Module
-{
-	CommandCSSetPeace commandcssetpeace;
-	CommandCSSASetPeace commandcssasetpeace;
-
- public:
-	CSSetPeace(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetpeace(this), commandcssasetpeace(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetPeace)

modules/commands/cs_set_private.cpp

@@ -1,91 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetPrivate : public Command
-{
- public:
-	CommandCSSetPrivate(Module *creator, const Anope::string &cname = "chanserv/set/private") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Hide channel from LIST command"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_PRIVATE);
-			source.Reply(_("Private option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_PRIVATE);
-			source.Reply(_("Private option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "PRIVATE");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables the \002private\002 option for a channel.\n"
-				"When \002private\002 is set, a \002%s%s LIST\002 will not\n"
-				"include the channel in any lists."),
-				Config->UseStrictPrivMsgString.c_str(), source.owner->nick.c_str());
-		return true;
-	}
-};
-
-class CommandCSSASetPrivate : public CommandCSSetPrivate
-{
- public:
-	CommandCSSASetPrivate(Module *creator) : CommandCSSetPrivate(creator, "chanserv/saset/private")
-	{
-	}
-};
-
-class CSSetPrivate : public Module
-{
-	CommandCSSetPrivate commandcssetprivate;
-	CommandCSSASetPrivate commandcssasetprivate;
-
- public:
-	CSSetPrivate(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetprivate(this), commandcssasetprivate(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetPrivate)

modules/commands/cs_set_restricted.cpp

@@ -1,89 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetRestricted : public Command
-{
- public:
-	CommandCSSetRestricted(Module *creator, const Anope::string &cname = "chanserv/set/restricted") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Restrict access to the channel"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_RESTRICTED);
-			source.Reply(_("Restricted access option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_RESTRICTED);
-			source.Reply(_("Restricted access option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "RESTRICTED");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables the \002restricted access\002 option for a\n"
-				"channel. When \002restricted access\002 is set, users not on the access list will\n"
-				"instead be kicked and banned from the channel."));
-		return true;
-	}
-};
-
-class CommandCSSASetRestricted : public CommandCSSetRestricted
-{
- public:
-	CommandCSSASetRestricted(Module *creator) : CommandCSSetRestricted(creator, "chanserv/saset/restricted")
-	{
-	}
-};
-
-class CSSetRestricted : public Module
-{
-	CommandCSSetRestricted commandcssetrestricted;
-	CommandCSSASetRestricted commandcssasetrestricted;
-
- public:
-	CSSetRestricted(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetrestricted(this), commandcssasetrestricted(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetRestricted)

modules/commands/cs_set_secure.cpp

@@ -1,92 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetSecure : public Command
-{
- public:
-	CommandCSSetSecure(Module *creator, const Anope::string &cname = "chanserv/set/secure") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Activate security features"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_SECURE);
-			source.Reply(_("Secure option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_SECURE);
-			source.Reply(_("Secure option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "SECURE");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables security features for a\n"
-			"channel. When \002%s\002 is set, only users who have\n"
-			"registered their nicknames and IDENTIFY'd\n"
-			"with their password will be given access to the channel\n"
-			"as controlled by the access list."), this->name.c_str());
-		return true;
-	}
-};
-
-class CommandCSSASetSecure : public CommandCSSetSecure
-{
- public:
-	CommandCSSASetSecure(Module *creator) : CommandCSSetSecure(creator, "chanserv/saset/secure")
-	{
-	}
-};
-
-class CSSetSecure : public Module
-{
-	CommandCSSetSecure commandcssetsecure;
-	CommandCSSASetSecure commandcssasetsecure;
-
- public:
-	CSSetSecure(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetsecure(this), commandcssasetsecure(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetSecure)

modules/commands/cs_set_securefounder.cpp

@@ -1,93 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetSecureFounder : public Command
-{
- public:
-	CommandCSSetSecureFounder(Module *creator, const Anope::string &cname = "chanserv/set/securefounder") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Stricter control of channel founder status"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-
-		if (source.permission.empty() && ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv("FOUNDER"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_SECUREFOUNDER);
-			source.Reply(_("Secure founder option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_SECUREFOUNDER);
-			source.Reply(_("Secure founder option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "SECUREFOUNDER");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables the \002secure founder\002 option for a channel.\n"
-			"When \002secure founder\002 is set, only the real founder will be\n"
-			"able to drop the channel, change its password, its founder and its\n"
-			"successor, and not those who have founder level access through\n"
-			"the access/qop command."));
-		return true;
-	}
-};
-
-class CommandCSSASetSecureFounder : public CommandCSSetSecureFounder
-{
- public:
-	CommandCSSASetSecureFounder(Module *creator) : CommandCSSetSecureFounder(creator, "chanserv/saset/securefounder")
-	{
-	}
-};
-
-class CSSetSecureFounder : public Module
-{
-	CommandCSSetSecureFounder commandcssetsecurefounder;
-	CommandCSSASetSecureFounder commandcssasetsecurefounder;
-
- public:
-	CSSetSecureFounder(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetsecurefounder(this), commandcssasetsecurefounder(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetSecureFounder)

modules/commands/cs_set_secureops.cpp

@@ -1,90 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetSecureOps : public Command
-{
- public:
-	CommandCSSetSecureOps(Module *creator, const Anope::string &cname = "chanserv/set/secureops") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Stricter control of chanop status"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_SECUREOPS);
-			source.Reply(_("Secure ops option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_SECUREOPS);
-			source.Reply(_("Secure ops option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "SECUREOPS");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables the \002secure ops\002 option for a channel.\n"
-				"When \002secure ops\002 is set, users who are not on the userlist\n"
-				"will not be allowed chanop status."));
-		return true;
-	}
-};
-
-class CommandCSSASetSecureOps : public CommandCSSetSecureOps
-{
- public:
-	CommandCSSASetSecureOps(Module *creator) : CommandCSSetSecureOps(creator, "chanserv/saset/secureops")
-	{
-	}
-};
-
-class CSSetSecureOps : public Module
-{
-	CommandCSSetSecureOps commandcssetsecureops;
-	CommandCSSASetSecureOps commandcssasetsecureops;
-
- public:
-	CSSetSecureOps(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetsecureops(this), commandcssasetsecureops(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetSecureOps)

modules/commands/cs_set_successor.cpp

@@ -1,117 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetSuccessor : public Command
-{
- public:
-	CommandCSSetSuccessor(Module *creator, const Anope::string &cname = "chanserv/set/successor") : Command(creator, cname, 1, 2)
-	{
-		this->SetDesc(_("Set the successor for a channel"));
-		this->SetSyntax(_("\037channel\037 \037nick\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (source.permission.empty() && ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !ci->AccessFor(u).HasPriv("FOUNDER"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		NickCore *nc;
-
-		if (params.size() > 1)
-		{
-			NickAlias *na = findnick(params[1]);
-
-			if (!na)
-			{
-				source.Reply(NICK_X_NOT_REGISTERED, params[1].c_str());
-				return;
-			}
-			if (na->nc == ci->GetFounder())
-			{
-				source.Reply(_("%s cannot be the successor on channel %s as they are the founder."), na->nick.c_str(), ci->name.c_str());
-				return;
-			}
-			nc = na->nc;
-		}
-		else
-			nc = NULL;
-
-		Log(!source.permission.empty() ? LOG_ADMIN : LOG_COMMAND, u, this, ci) << "to change the successor from " << (ci->successor ? ci->successor->display : "(none)") << " to " << (nc ? nc->display : "(none)");
-
-		ci->successor = nc;
-
-		if (nc)
-			source.Reply(_("Successor for \002%s\002 changed to \002%s\002."), ci->name.c_str(), nc->display.c_str());
-		else
-			source.Reply(_("Successor for \002%s\002 unset."), ci->name.c_str());
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Changes the successor of a channel. If the founder's\n"
-				"nickname expires or is dropped while the channel is still\n"
-				"registered, the successor will become the new founder of the\n"
-				"channel.  However, if the successor already has too many\n"
-				"channels registered (%d), the channel will be dropped\n"
-				"instead, just as if no successor had been set.  The new\n"
-				"nickname must be a registered one."), Config->CSMaxReg);
-		return true;
-	}
-};
-
-class CommandCSSASetSuccessor : public CommandCSSetSuccessor
-{
- public:
-	CommandCSSASetSuccessor(Module *creator) : CommandCSSetSuccessor(creator, "chanserv/saset/successor")
-	{
-	}
-};
-
-class CSSetSuccessor : public Module
-{
-	CommandCSSetSuccessor commandcssetsuccessor;
-	CommandCSSASetSuccessor commandcssasetsuccessor;
-
- public:
-	CSSetSuccessor(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssetsuccessor(this), commandcssasetsuccessor(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetSuccessor)

modules/commands/cs_set_topiclock.cpp

@@ -1,90 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-class CommandCSSetTopicLock : public Command
-{
- public:
-	CommandCSSetTopicLock(Module *creator, const Anope::string &cname = "chanserv/set/topiclock") : Command(creator, cname, 2, 2)
-	{
-		this->SetDesc(_("Topic can only be changed with TOPIC"));
-		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		if (source.permission.empty() && !ci->AccessFor(u).HasPriv("SET"))
-		{
-			source.Reply(ACCESS_DENIED);
-			return;
-		}
-
-		if (params[1].equals_ci("ON"))
-		{
-			ci->SetFlag(CI_TOPICLOCK);
-			source.Reply(_("Topic lock option for %s is now \002on\002."), ci->name.c_str());
-		}
-		else if (params[1].equals_ci("OFF"))
-		{
-			ci->UnsetFlag(CI_TOPICLOCK);
-			source.Reply(_("Topic lock option for %s is now \002off\002."), ci->name.c_str());
-		}
-		else
-			this->OnSyntaxError(source, "TOPICLOCK");
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Enables or disables the \002topic lock\002 option for a channel.\n"
-				"When \002topic lock\002 is set, the channel topic will be unchangable\n"
-				" except via the \002TOPIC\002 command."));
-		return true;
-	}
-};
-
-class CommandCSSASetTopicLock : public CommandCSSetTopicLock
-{
- public:
-	CommandCSSASetTopicLock(Module *creator) : CommandCSSetTopicLock(creator, "chanserv/saset/topiclock")
-	{
-	}
-};
-
-class CSSetTopicLock : public Module
-{
-	CommandCSSetTopicLock commandcssettopiclock;
-	CommandCSSASetTopicLock commandcssasettopiclock;
-
- public:
-	CSSetTopicLock(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		commandcssettopiclock(this), commandcssasettopiclock(this)
-	{
-		this->SetAuthor("Anope");
-
-	}
-};
-
-MODULE_INIT(CSSetTopicLock)

modules/commands/cs_suspend.cpp

@@ -1,252 +0,0 @@
-/* ChanServ core functions
- *
- * (C) 2003-2012 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.
- */
-
-/*************************************************************************/
-
-#include "module.h"
-
-struct ChanSuspend : ExtensibleItem, Serializable
-{
-	Anope::string chan;
-	time_t when;
-
-	ChanSuspend()
-	{
-	}
-
-	Anope::string serialize_name() const
-	{
-		return "ChanSuspend";
-	}
-
-	serialized_data serialize()
-	{
-		serialized_data sd;
-
-		sd["chan"] << this->chan;
-		sd["when"] << this->when;
-
-		return sd;
-	}
-
-	static void unserialize(serialized_data &sd)
-	{
-		ChannelInfo *ci = cs_findchan(sd["chan"].astr());
-		if (ci == NULL)
-			return;
-
-		ChanSuspend *cs = new ChanSuspend();
-		
-		sd["chan"] >> cs->chan;
-		sd["when"] >> cs->when;
-
-		ci->Extend("ci_suspend_expire", cs);
-	}
-};
-
-class CommandCSSuspend : public Command
-{
- public:
-	CommandCSSuspend(Module *creator) : Command(creator, "chanserv/suspend", 1, 3)
-	{ 
-		this->SetDesc(_("Prevent a channel from being used preserving channel data and settings"));
-		this->SetSyntax(_("\037channel\037 [+\037expiry\037] [\037reason\037]"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		const Anope::string &chan = params[0];
-		Anope::string expiry = params.size() > 1 ? params[1] : "";
-		Anope::string reason = params.size() > 2 ? params[2] : "";
-		time_t expiry_secs = Config->CSSuspendExpire;
-
-		User *u = source.u;
-
-		if (!expiry.empty() && expiry[0] != '+')
-		{
-			reason = expiry + " " + reason;
-			reason.trim();
-			expiry.clear();
-		}
-		else
-			expiry_secs = dotime(expiry);
-
-		if (Config->ForceForbidReason && reason.empty())
-		{
-			this->OnSyntaxError(source, "");
-			return;
-		}
-
-		if (readonly)
-			source.Reply(READ_ONLY_MODE);
-
-		ChannelInfo *ci = cs_findchan(chan);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, chan.c_str());
-			return;
-		}
-
-		ci->SetFlag(CI_SUSPENDED);
-		ci->Extend("suspend_by", new ExtensibleString(u->nick));
-		if (!reason.empty())
-			ci->Extend("suspend_reason", new ExtensibleString(reason));
-
-		if (ci->c)
-		{
-			for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; )
-			{
-				UserContainer *uc = *it++;
-
-				if (uc->user->HasMode(UMODE_OPER))
-					continue;
-
-				ci->c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : translate(uc->user, _("This channel has been suspended.")));
-			}
-		}
-
-		if (expiry_secs > 0)
-		{
-			ChanSuspend *cs = new ChanSuspend();
-			cs->chan = ci->name;
-			cs->when = Anope::CurTime + expiry_secs;
-
-			ci->Extend("cs_suspend_expire", cs);
-		}
-
-		Log(LOG_ADMIN, u, this, ci) << (!reason.empty() ? reason : "No reason") << ", expires in " << (expiry_secs ? do_strftime(Anope::CurTime + expiry_secs) : "never");
-		source.Reply(_("Channel \002%s\002 is now suspended."), ci->name.c_str());
-
-		FOREACH_MOD(I_OnChanSuspend, OnChanSuspend(ci));
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Disallows anyone from using the given channel.\n"
-				"May be cancelled by using the UNSUSPEND\n"
-				"command to preserve all previous channel data/settings.\n"
-				"If an expiry is given the channel will be unsuspended after\n"
-				"that period of time, else the default expiry from the"
-				"configuration is used.\n"
-				" \n"
-				"Reason may be required on certain networks."));
-		return true;
-	}
-};
-
-class CommandCSUnSuspend : public Command
-{
- public:
-	CommandCSUnSuspend(Module *creator) : Command(creator, "chanserv/unsuspend", 1, 1)
-	{
-		this->SetDesc(_("Releases a suspended channel"));
-		this->SetSyntax(_("\037channel\037"));
-	}
-
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
-	{
-		User *u = source.u;
-
-		if (readonly)
-			source.Reply(READ_ONLY_MODE);
-
-		ChannelInfo *ci = cs_findchan(params[0]);
-		if (ci == NULL)
-		{
-			source.Reply(CHAN_X_NOT_REGISTERED, params[0].c_str());
-			return;
-		}
-
-		/* Only UNSUSPEND already suspended channels */
-		if (!ci->HasFlag(CI_SUSPENDED))
-		{
-			source.Reply(_("Couldn't release channel \002%s\002!"), ci->name.c_str());
-			return;
-		}
-
-		Anope::string *by = ci->GetExt<ExtensibleString *>("suspend_by"), *reason = ci->GetExt<ExtensibleString *>("suspend_reason");
-		if (by != NULL)
-			Log(LOG_ADMIN, u, this, ci) << " which was suspended by " << *by << " for: " << (reason && !reason->empty() ? *reason : "No reason");
-
-		ci->UnsetFlag(CI_SUSPENDED);
-		ci->Shrink("suspend_by");
-		ci->Shrink("suspend_reason");
-		ci->Shrink("cs_suspend_expire");
-
-		source.Reply(_("Channel \002%s\002 is now released."), ci->name.c_str());
-
-		FOREACH_MOD(I_OnChanUnsuspend, OnChanUnsuspend(ci));
-
-		return;
-	}
-
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
-	{
-		this->SendSyntax(source);
-		source.Reply(" ");
-		source.Reply(_("Releases a suspended channel. All data and settings\n"
-				"are preserved from before the suspension."));
-		return true;
-	}
-};
-
-class CSSuspend : public Module
-{
-	SerializeType chansuspend_type;
-	CommandCSSuspend commandcssuspend;
-	CommandCSUnSuspend commandcsunsuspend;
-
- public:
-	CSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
-		chansuspend_type("ChanSuspend", ChanSuspend::unserialize), commandcssuspend(this), commandcsunsuspend(this)
-	{
-		this->SetAuthor("Anope");
-
-		Implementation i[] = { I_OnPreChanExpire };
-		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
-	}
-
-	~CSSuspend()
-	{
-		for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it)
-		{
-			it->second->Shrink("cs_suspend_expire");
-			it->second->Shrink("suspend_by");
-			it->second->Shrink("suspend_reason");
-		}
-	}
-
-	void OnPreChanExpire(ChannelInfo *ci, bool &expire)
-	{
-		if (!ci->HasFlag(CI_SUSPENDED))
-			return;
-
-		expire = false;
-
-		ChanSuspend *cs = ci->GetExt<ChanSuspend *>("cs_suspend_expire");
-		if (cs != NULL && cs->when < Anope::CurTime)
-		{
-			ci->last_used = Anope::CurTime;
-			ci->UnsetFlag(CI_SUSPENDED);
-			ci->Shrink("cs_suspend_expire");
-			ci->Shrink("suspend_by");
-			ci->Shrink("suspend_reason");
-
-			Log(LOG_NORMAL, "expire", findbot(Config->ChanServ)) << "Expiring suspend for " << ci->name;
-		}
-	}
-};
-
-MODULE_INIT(CSSuspend)