From 207c46c871e85b55ae66acc456c6bc412c0c79f9 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 10 Apr 2013 22:26:40 -0500 Subject: Move some of the modules in extras/ that arent really extra out of extras. Mark our modules as VENDOR and allow modules to have multple types. --- modules/CMakeLists.txt | 203 ++++++++++++++++---------------- modules/bs_autoassign.cpp | 48 ++++++++ modules/commands/bs_assign.cpp | 3 +- modules/commands/bs_badwords.cpp | 3 +- modules/commands/bs_bot.cpp | 3 +- modules/commands/bs_botlist.cpp | 3 +- modules/commands/bs_control.cpp | 3 +- modules/commands/bs_info.cpp | 3 +- modules/commands/bs_kick.cpp | 3 +- modules/commands/bs_set.cpp | 3 +- modules/commands/cs_access.cpp | 3 +- modules/commands/cs_akick.cpp | 3 +- modules/commands/cs_ban.cpp | 3 +- modules/commands/cs_clone.cpp | 3 +- modules/commands/cs_drop.cpp | 3 +- modules/commands/cs_enforce.cpp | 3 +- modules/commands/cs_entrymsg.cpp | 3 +- modules/commands/cs_fantasy_stats.cpp | 3 +- modules/commands/cs_fantasy_top.cpp | 3 +- modules/commands/cs_flags.cpp | 3 +- modules/commands/cs_getkey.cpp | 3 +- modules/commands/cs_info.cpp | 3 +- modules/commands/cs_invite.cpp | 3 +- modules/commands/cs_kick.cpp | 3 +- modules/commands/cs_list.cpp | 3 +- modules/commands/cs_log.cpp | 3 +- modules/commands/cs_mode.cpp | 3 +- modules/commands/cs_register.cpp | 3 +- modules/commands/cs_seen.cpp | 3 +- modules/commands/cs_set.cpp | 3 +- modules/commands/cs_set_misc.cpp | 3 +- modules/commands/cs_status.cpp | 3 +- modules/commands/cs_suspend.cpp | 3 +- modules/commands/cs_sync.cpp | 3 +- modules/commands/cs_topic.cpp | 3 +- modules/commands/cs_unban.cpp | 3 +- modules/commands/cs_updown.cpp | 3 +- modules/commands/cs_xop.cpp | 3 +- modules/commands/gl_global.cpp | 3 +- modules/commands/help.cpp | 3 +- modules/commands/hs_del.cpp | 3 +- modules/commands/hs_group.cpp | 3 +- modules/commands/hs_list.cpp | 3 +- modules/commands/hs_off.cpp | 3 +- modules/commands/hs_on.cpp | 3 +- modules/commands/hs_request.cpp | 3 +- modules/commands/hs_set.cpp | 3 +- modules/commands/ms_cancel.cpp | 3 +- modules/commands/ms_check.cpp | 3 +- modules/commands/ms_del.cpp | 3 +- modules/commands/ms_ignore.cpp | 3 +- modules/commands/ms_info.cpp | 3 +- modules/commands/ms_list.cpp | 3 +- modules/commands/ms_read.cpp | 3 +- modules/commands/ms_rsend.cpp | 3 +- modules/commands/ms_send.cpp | 3 +- modules/commands/ms_sendall.cpp | 3 +- modules/commands/ms_set.cpp | 3 +- modules/commands/ms_staff.cpp | 3 +- modules/commands/ns_access.cpp | 3 +- modules/commands/ns_ajoin.cpp | 3 +- modules/commands/ns_alist.cpp | 3 +- modules/commands/ns_cert.cpp | 3 +- modules/commands/ns_drop.cpp | 3 +- modules/commands/ns_getemail.cpp | 3 +- modules/commands/ns_getpass.cpp | 3 +- modules/commands/ns_group.cpp | 3 +- modules/commands/ns_identify.cpp | 3 +- modules/commands/ns_info.cpp | 3 +- modules/commands/ns_list.cpp | 3 +- modules/commands/ns_logout.cpp | 3 +- modules/commands/ns_recover.cpp | 3 +- modules/commands/ns_register.cpp | 3 +- modules/commands/ns_resetpass.cpp | 3 +- modules/commands/ns_set.cpp | 3 +- modules/commands/ns_set_misc.cpp | 3 +- modules/commands/ns_status.cpp | 3 +- modules/commands/ns_suspend.cpp | 3 +- modules/commands/ns_update.cpp | 3 +- modules/commands/os_akill.cpp | 3 +- modules/commands/os_chankill.cpp | 3 +- modules/commands/os_config.cpp | 3 +- modules/commands/os_defcon.cpp | 3 +- modules/commands/os_dns.cpp | 3 +- modules/commands/os_forbid.cpp | 3 +- modules/commands/os_ignore.cpp | 3 +- modules/commands/os_jupe.cpp | 3 +- modules/commands/os_kick.cpp | 3 +- modules/commands/os_kill.cpp | 3 +- modules/commands/os_list.cpp | 3 +- modules/commands/os_login.cpp | 3 +- modules/commands/os_logsearch.cpp | 3 +- modules/commands/os_mode.cpp | 3 +- modules/commands/os_modinfo.cpp | 199 ++++++++++++------------------- modules/commands/os_module.cpp | 3 +- modules/commands/os_news.cpp | 3 +- modules/commands/os_noop.cpp | 3 +- modules/commands/os_oline.cpp | 3 +- modules/commands/os_oper.cpp | 3 +- modules/commands/os_reload.cpp | 3 +- modules/commands/os_session.cpp | 3 +- modules/commands/os_set.cpp | 3 +- modules/commands/os_shutdown.cpp | 3 +- modules/commands/os_stats.cpp | 3 +- modules/commands/os_svs.cpp | 3 +- modules/commands/os_sxline.cpp | 3 +- modules/commands/os_update.cpp | 3 +- modules/cs_statusupdate.cpp | 66 +++++++++++ modules/database/db_flatfile.cpp | 3 +- modules/database/db_old.cpp | 3 +- modules/database/db_plain.cpp | 3 +- modules/database/db_sql.cpp | 3 +- modules/database/db_sql_live.cpp | 2 +- modules/encryption/enc_md5.cpp | 3 +- modules/encryption/enc_none.cpp | 3 +- modules/encryption/enc_old.cpp | 3 +- modules/encryption/enc_sha1.cpp | 3 +- modules/encryption/enc_sha256.cpp | 3 +- modules/extra/bs_autoassign.cpp | 51 -------- modules/extra/cs_statusupdate.cpp | 67 ----------- modules/extra/m_chanstats.cpp | 3 +- modules/extra/m_dns.cpp | 3 +- modules/extra/m_dnsbl.cpp | 176 --------------------------- modules/extra/m_helpchan.cpp | 46 -------- modules/extra/m_httpd.cpp | 3 +- modules/extra/m_ldap.cpp | 2 +- modules/extra/m_ldap_authentication.cpp | 3 +- modules/extra/m_ldap_oper.cpp | 3 +- modules/extra/m_mysql.cpp | 2 +- modules/extra/m_proxyscan.cpp | 3 +- modules/extra/m_regex_pcre.cpp | 3 +- modules/extra/m_regex_posix.cpp | 3 +- modules/extra/m_regex_tre.cpp | 3 +- modules/extra/m_rewrite.cpp | 192 ------------------------------ modules/extra/m_sql_authentication.cpp | 3 +- modules/extra/m_sql_oper.cpp | 3 +- modules/extra/m_sqlite.cpp | 2 +- modules/extra/m_ssl.cpp | 3 +- modules/extra/m_xmlrpc.cpp | 2 +- modules/extra/m_xmlrpc_main.cpp | 2 +- modules/extra/ns_maxemail.cpp | 88 -------------- modules/extra/webcpanel/webcpanel.cpp | 3 +- modules/m_dnsbl.cpp | 175 +++++++++++++++++++++++++++ modules/m_helpchan.cpp | 45 +++++++ modules/m_rewrite.cpp | 191 ++++++++++++++++++++++++++++++ modules/ns_maxemail.cpp | 87 ++++++++++++++ modules/protocol/bahamut.cpp | 3 +- modules/protocol/charybdis.cpp | 3 +- modules/protocol/hybrid.cpp | 3 +- modules/protocol/inspircd11.cpp | 3 +- modules/protocol/inspircd12.cpp | 3 +- modules/protocol/inspircd20.cpp | 3 +- modules/protocol/ngircd.cpp | 3 +- modules/protocol/plexus.cpp | 3 +- modules/protocol/ratbox.cpp | 3 +- modules/protocol/unreal.cpp | 3 +- modules/pseudoclients/botserv.cpp | 3 +- modules/pseudoclients/chanserv.cpp | 3 +- modules/pseudoclients/global.cpp | 3 +- modules/pseudoclients/hostserv.cpp | 3 +- modules/pseudoclients/memoserv.cpp | 3 +- modules/pseudoclients/nickserv.cpp | 3 +- modules/pseudoclients/operserv.cpp | 3 +- 163 files changed, 942 insertions(+), 1133 deletions(-) create mode 100644 modules/bs_autoassign.cpp create mode 100644 modules/cs_statusupdate.cpp delete mode 100644 modules/extra/bs_autoassign.cpp delete mode 100644 modules/extra/cs_statusupdate.cpp delete mode 100644 modules/extra/m_dnsbl.cpp delete mode 100644 modules/extra/m_helpchan.cpp delete mode 100644 modules/extra/m_rewrite.cpp delete mode 100644 modules/extra/ns_maxemail.cpp create mode 100644 modules/m_dnsbl.cpp create mode 100644 modules/m_helpchan.cpp create mode 100644 modules/m_rewrite.cpp create mode 100644 modules/ns_maxemail.cpp (limited to 'modules') diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 75d22af4a..5a02b16b4 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -3,6 +3,7 @@ add_subdirectory("third/language") # Get a list of ALL files and directories within the current directory file(GLOB MODULES_FOLDERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*") remove_item_from_list(MODULES_FOLDERS "CMakeFiles") +append_to_list(MODULES_FOLDERS ".") # If using Windows, add the MODULE_COMPILE define if(WIN32) @@ -98,109 +99,111 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES) endforeach(SRC) - # 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") - - foreach(SUBDIR ${SUBMODULE_DIRS}) - if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}") - file(GLOB_RECURSE MODULES_SUBDIR_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${SUBDIR}/*.cpp") - sort_list(MODULES_SUBDIR_SRCS) - - # Set all the files to use C++ as well as set their compile flags (use the module-specific compile flags, though) - set_source_files_properties(${MODULES_SUBDIR_SRCS} PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}") - - # Get the length of this subdir - string(LENGTH ${SUBDIR} SUBDIR_LEN) - # Calculate the length of the folder - math(EXPR FILE_LEN "${SUBDIR_LEN} - ${FOLDER_LEN}") - # Extract this subfolders name to use to generate the .so file - string(SUBSTRING ${SUBDIR} ${FOLDER_LEN} ${FILE_LEN} SUBDIR_REALNAME) - # Add .so to the end of the directory name, this will be the module's name - set(SO "${SUBDIR_REALNAME}.so") - - # Temporary linker flags for this subdirectory - set(SUBDIR_LDFLAGS "${LDFLAGS}") - # Temporary extra dependencies for this subdirectory - set(SUBDIR_EXTRA_DEPENDS) - # Reset skip_depends - set(SKIP_DEPENDS) - # Reset skip_libraries - set(SKIP_LIBRARIES) - # Reset has_function - set(HAS_FUNCTION TRUE) - - # Iterate through the source files in the subdirectory - foreach(SRC ${MODULES_SUBDIR_SRCS}) + if(NOT MODULE_FOLDER STREQUAL ".") + # 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") + + foreach(SUBDIR ${SUBMODULE_DIRS}) + if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}") + file(GLOB_RECURSE MODULES_SUBDIR_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${SUBDIR}/*.cpp") + sort_list(MODULES_SUBDIR_SRCS) + + # Set all the files to use C++ as well as set their compile flags (use the module-specific compile flags, though) + set_source_files_properties(${MODULES_SUBDIR_SRCS} PROPERTIES LANGUAGE CXX COMPILE_FLAGS "${CXXFLAGS}") + + # Get the length of this subdir + string(LENGTH ${SUBDIR} SUBDIR_LEN) + # Calculate the length of the folder + math(EXPR FILE_LEN "${SUBDIR_LEN} - ${FOLDER_LEN}") + # Extract this subfolders name to use to generate the .so file + string(SUBSTRING ${SUBDIR} ${FOLDER_LEN} ${FILE_LEN} SUBDIR_REALNAME) + # Add .so to the end of the directory name, this will be the module's name + set(SO "${SUBDIR_REALNAME}.so") + + # Temporary linker flags for this subdirectory + set(SUBDIR_LDFLAGS "${LDFLAGS}") + # Temporary extra dependencies for this subdirectory + set(SUBDIR_EXTRA_DEPENDS) + # Reset skip_depends + set(SKIP_DEPENDS) + # Reset skip_libraries + set(SKIP_LIBRARIES) + # Reset has_function + set(HAS_FUNCTION TRUE) + + # Iterate through the source files in the subdirectory + foreach(SRC ${MODULES_SUBDIR_SRCS}) + if(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) + # Temporary variable for the current source's include directories + set(TEMP_INCLUDES) + # Calculate the header file dependencies for the given source file + calculate_depends(${SRC} SKIP_DEPENDS MODULE TEMP_INCLUDES) + # If there were some extra include directories, add them to the list + if(TEMP_INCLUDES) + append_to_list(EXTRA_INCLUDES ${TEMP_INCLUDES}) + endif(TEMP_INCLUDES) + # Reset linker flags + set(TEMP_LDFLAGS) + # Reset extra dependencies + set(TEMP_DEPENDENCIES) + # Calculate the library dependencies for the given source file + calculate_libraries(${SRC} SKIP_LIBRARIES MODULE TEMP_LDFLAGS TEMP_DEPENDENCIES) + # Check the function dependencies for the given source file + check_functions(${SRC} HAS_FUNCTION) + + # Append this source file's linker flags to the subdirectoy's linker flags, if there are any to append + if(TEMP_DEPENDENCIES) + append_to_list(SUBDIR_EXTRA_DEPENDS ${TEMP_DEPDENCIES}) + endif(TEMP_DEPENDENCIES) + endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) + endforeach(SRC) + + # Continue if library and function requirements are met if(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) - # Temporary variable for the current source's include directories - set(TEMP_INCLUDES) - # Calculate the header file dependencies for the given source file - calculate_depends(${SRC} SKIP_DEPENDS MODULE TEMP_INCLUDES) - # If there were some extra include directories, add them to the list - if(TEMP_INCLUDES) - append_to_list(EXTRA_INCLUDES ${TEMP_INCLUDES}) - endif(TEMP_INCLUDES) - # Reset linker flags - set(TEMP_LDFLAGS) - # Reset extra dependencies - set(TEMP_DEPENDENCIES) - # Calculate the library dependencies for the given source file - calculate_libraries(${SRC} SKIP_LIBRARIES MODULE TEMP_LDFLAGS TEMP_DEPENDENCIES) - # Check the function dependencies for the given source file - check_functions(${SRC} HAS_FUNCTION) - - # Append this source file's linker flags to the subdirectoy's linker flags, if there are any to append - if(TEMP_DEPENDENCIES) - append_to_list(SUBDIR_EXTRA_DEPENDS ${TEMP_DEPDENCIES}) - endif(TEMP_DEPENDENCIES) + # Remove duplicates from the linker flags + if(SUBDIR_LDFLAGS) + remove_list_duplicates(SUBDIR_LDFLAGS) + endif(SUBDIR_LDFLAGS) + # Remove duplicates from the extra dependencies + if(SUBDIR_EXTRA_DEPENDS) + remove_list_duplicates(SUBDIR_EXTRA_DEPENDS) + endif(SUBDIR_EXTRA_DEPENDS) + + # For Visual Studio only, include win32_memory static library, required to override Visual Studio's overrides of the new/delete operators + if(MSVC) + set(WIN32_MEMORY win32_memory) + else(MSVC) + set(WIN32_MEMORY) + endif(MSVC) + + # 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}" INSTALL_RPATH_USE_LINK_PATH ON BUILD_WITH_INSTALL_RPATH ON) + add_dependencies(${SO} ${PROGRAM_NAME}) + target_link_libraries(${SO} ${PROGRAM_NAME}) + if(GETTEXT_FOUND) + add_dependencies(${SO} module_language) + endif(GETTEXT_FOUND) + # 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}) + set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") + endif(WIN32) + # Set the module to be installed to the module directory under the data directory + install(TARGETS ${SO} + DESTINATION ${LIB_DIR}/modules + ) endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) - endforeach(SRC) - - # Continue if library and function requirements are met - if(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) - # Remove duplicates from the linker flags - if(SUBDIR_LDFLAGS) - remove_list_duplicates(SUBDIR_LDFLAGS) - endif(SUBDIR_LDFLAGS) - # Remove duplicates from the extra dependencies - if(SUBDIR_EXTRA_DEPENDS) - remove_list_duplicates(SUBDIR_EXTRA_DEPENDS) - endif(SUBDIR_EXTRA_DEPENDS) - # For Visual Studio only, include win32_memory static library, required to override Visual Studio's overrides of the new/delete operators - if(MSVC) - set(WIN32_MEMORY win32_memory) - else(MSVC) - set(WIN32_MEMORY) - endif(MSVC) - - # 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}" INSTALL_RPATH_USE_LINK_PATH ON BUILD_WITH_INSTALL_RPATH ON) - add_dependencies(${SO} ${PROGRAM_NAME}) - target_link_libraries(${SO} ${PROGRAM_NAME}) - if(GETTEXT_FOUND) - add_dependencies(${SO} module_language) - endif(GETTEXT_FOUND) - # 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}) - set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") - endif(WIN32) - # Set the module to be installed to the module directory under the data directory - install(TARGETS ${SO} - DESTINATION ${LIB_DIR}/modules - ) - endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES AND HAS_FUNCTION) - - # Run the directories CMakeLists.txt if there is one - if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}") - endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt") - endif(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}") - endforeach(SUBDIR) + # Run the directories CMakeLists.txt if there is one + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt") + add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}") + endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt") + endif(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}") + endforeach(SUBDIR) + endif(NOT MODULE_FOLDER STREQUAL ".") endif(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_FOLDER}") endforeach(MODULE_FOLDER) diff --git a/modules/bs_autoassign.cpp b/modules/bs_autoassign.cpp new file mode 100644 index 000000000..13bde5ff5 --- /dev/null +++ b/modules/bs_autoassign.cpp @@ -0,0 +1,48 @@ +/* + * + * (C) 2003-2013 Anope Team + * Contact us at team@anope.org + * + * Please read COPYING and README for further details. + * + */ + +#include "module.h" + +class BSAutoAssign : public Module +{ + Anope::string bot; + + public: + BSAutoAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR) + { + + Implementation i[] = { I_OnChanRegistered, I_OnReload }; + ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); + + this->OnReload(); + } + + void OnChanRegistered(ChannelInfo *ci) anope_override + { + if (this->bot.empty()) + return; + + BotInfo *bi = BotInfo::Find(this->bot); + if (bi == NULL) + { + Log(this) << "bs_autoassign is configured to assign bot " << this->bot << ", but it does not exist?"; + return; + } + + bi->Assign(NULL, ci); + } + + void OnReload() anope_override + { + ConfigReader config; + this->bot = config.ReadValue("bs_autoassign", "bot", "", 0); + } +}; + +MODULE_INIT(BSAutoAssign) diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp index 93cb5f907..027193f62 100644 --- a/modules/commands/bs_assign.cpp +++ b/modules/commands/bs_assign.cpp @@ -153,10 +153,9 @@ class BSAssign : public Module CommandBSUnassign commandbsunassign; public: - BSAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSAssign(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbsassign(this), commandbsunassign(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp index 147b23b95..90fbb875d 100644 --- a/modules/commands/bs_badwords.cpp +++ b/modules/commands/bs_badwords.cpp @@ -313,10 +313,9 @@ class BSBadwords : public Module CommandBSBadwords commandbsbadwords; public: - BSBadwords(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSBadwords(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbsbadwords(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp index dd6da27d6..f8ecb1a1d 100644 --- a/modules/commands/bs_bot.cpp +++ b/modules/commands/bs_bot.cpp @@ -355,10 +355,9 @@ class BSBot : public Module CommandBSBot commandbsbot; public: - BSBot(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSBot(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbsbot(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp index cacfce903..9eac75e88 100644 --- a/modules/commands/bs_botlist.cpp +++ b/modules/commands/bs_botlist.cpp @@ -75,10 +75,9 @@ class BSBotList : public Module CommandBSBotList commandbsbotlist; public: - BSBotList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSBotList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbsbotlist(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp index d78ca6851..32e9392d7 100644 --- a/modules/commands/bs_control.cpp +++ b/modules/commands/bs_control.cpp @@ -138,10 +138,9 @@ class BSControl : public Module CommandBSAct commandbsact; public: - BSControl(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSControl(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbssay(this), commandbsact(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp index b1e05bb17..6c017dc55 100644 --- a/modules/commands/bs_info.cpp +++ b/modules/commands/bs_info.cpp @@ -238,10 +238,9 @@ class BSInfo : public Module CommandBSInfo commandbsinfo; public: - BSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbsinfo(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp index 97f6b6035..86248ae80 100644 --- a/modules/commands/bs_kick.cpp +++ b/modules/commands/bs_kick.cpp @@ -789,7 +789,7 @@ class BSKick : public Module } public: - BSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbskick(this), commandbskickamsg(this), commandbskickbadwords(this), commandbskickbolds(this), commandbskickcaps(this), commandbskickcolors(this), commandbskickflood(this), commandbskickitalics(this), commandbskickrepeat(this), @@ -797,7 +797,6 @@ class BSKick : public Module purger(this) { - this->SetAuthor("Anope"); ModuleManager::Attach(I_OnPrivmsg, this); } diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp index b7e43eb9b..4bf8609ef 100644 --- a/modules/commands/bs_set.cpp +++ b/modules/commands/bs_set.cpp @@ -493,11 +493,10 @@ class BSSet : public Module CommandBSSetPrivate commandbssetprivate; public: - BSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + BSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandbsset(this), commandbssetbanexpire(this), commandbssetdontkickops(this), commandbssetdontkickvoices(this), commandbssetfantasy(this), commandbssetgreet(this), commandbssetnobot(this), commandbssetprivate(this) { - this->SetAuthor("Anope"); ModuleManager::Attach(I_OnBotBan, this); } diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp index e6f32d8d2..10a4c9885 100644 --- a/modules/commands/cs_access.cpp +++ b/modules/commands/cs_access.cpp @@ -783,10 +783,9 @@ class CSAccess : public Module CommandCSLevels commandcslevels; public: - CSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), accessprovider(this), commandcsaccess(this), commandcslevels(this) { - this->SetAuthor("Anope"); this->SetPermanent(true); Implementation i[] = { I_OnReload, I_OnCreateChan, I_OnGroupCheckPriv }; diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp index f2bd603f9..b2b1c7579 100644 --- a/modules/commands/cs_akick.cpp +++ b/modules/commands/cs_akick.cpp @@ -510,10 +510,9 @@ class CSAKick : public Module CommandCSAKick commandcsakick; public: - CSAKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSAKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsakick(this) { - this->SetAuthor("Anope"); Implementation i[] = { I_OnCheckKick }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp index 5aad394a3..7d441f14d 100644 --- a/modules/commands/cs_ban.cpp +++ b/modules/commands/cs_ban.cpp @@ -212,9 +212,8 @@ class CSBan : public Module CommandCSBan commandcsban; public: - CSBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsban(this) + CSBan(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsban(this) { - this->SetAuthor("Anope"); me = this; } }; diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp index 9a33a6fab..da8c82647 100644 --- a/modules/commands/cs_clone.cpp +++ b/modules/commands/cs_clone.cpp @@ -177,9 +177,8 @@ class CSClone : public Module CommandCSClone commandcsclone; public: - CSClone(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsclone(this) + CSClone(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsclone(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp index 884544211..ade021dc1 100644 --- a/modules/commands/cs_drop.cpp +++ b/modules/commands/cs_drop.cpp @@ -87,9 +87,8 @@ class CSDrop : public Module CommandCSDrop commandcsdrop; public: - CSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsdrop(this) + CSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsdrop(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index fd5caf613..0579ebb2b 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -282,10 +282,9 @@ class CSEnforce : public Module CommandCSEnforce commandcsenforce; public: - CSEnforce(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSEnforce(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsenforce(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp index 68c36e7c7..bb82e9b24 100644 --- a/modules/commands/cs_entrymsg.cpp +++ b/modules/commands/cs_entrymsg.cpp @@ -273,9 +273,8 @@ class CSEntryMessage : public Module CommandEntryMessage commandentrymsg; public: - CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), entrymsg_type("EntryMsg", EntryMsg::Unserialize), commandentrymsg(this) + CSEntryMessage(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), entrymsg_type("EntryMsg", EntryMsg::Unserialize), commandentrymsg(this) { - this->SetAuthor("Anope"); Implementation i[] = { I_OnReload, I_OnJoinChannel }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_fantasy_stats.cpp b/modules/commands/cs_fantasy_stats.cpp index 580307441..591da28e9 100644 --- a/modules/commands/cs_fantasy_stats.cpp +++ b/modules/commands/cs_fantasy_stats.cpp @@ -68,11 +68,10 @@ class CSStats : public Module MySQLInterface sqlinterface; Anope::string prefix; public: - CSStats(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSStats(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsstats(this), commandcsgstats(this), sql("", ""), sqlinterface(this) { me = this; - this->SetAuthor("Anope"); Implementation i[] = { I_OnReload }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_fantasy_top.cpp b/modules/commands/cs_fantasy_top.cpp index 16d65dd05..739f21f41 100644 --- a/modules/commands/cs_fantasy_top.cpp +++ b/modules/commands/cs_fantasy_top.cpp @@ -94,12 +94,11 @@ class CSTop : public Module Anope::string prefix; public: - CSTop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSTop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcstop(this), commandcsgtop(this), commandcstop10(this), commandcsgtop10(this), sql("", ""), sqlinterface(this) { me = this; - this->SetAuthor("Anope"); Implementation i[] = { I_OnReload }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp index 4681c3d61..bdff5a6e5 100644 --- a/modules/commands/cs_flags.cpp +++ b/modules/commands/cs_flags.cpp @@ -387,10 +387,9 @@ class CSFlags : public Module CommandCSFlags commandcsflags; public: - CSFlags(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSFlags(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), accessprovider(this), commandcsflags(this) { - this->SetAuthor("Anope"); this->SetPermanent(true); Implementation i[] = { I_OnReload }; diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp index 1ac5633ea..ec64b45f8 100644 --- a/modules/commands/cs_getkey.cpp +++ b/modules/commands/cs_getkey.cpp @@ -67,9 +67,8 @@ class CSGetKey : public Module CommandCSGetKey commandcsgetkey; public: - CSGetKey(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsgetkey(this) + CSGetKey(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsgetkey(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp index 9485e81fd..a686541be 100644 --- a/modules/commands/cs_info.cpp +++ b/modules/commands/cs_info.cpp @@ -142,10 +142,9 @@ class CSInfo : public Module CommandCSInfo commandcsinfo; public: - CSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsinfo(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp index bb59d538e..4b204bfc4 100644 --- a/modules/commands/cs_invite.cpp +++ b/modules/commands/cs_invite.cpp @@ -104,9 +104,8 @@ class CSInvite : public Module CommandCSInvite commandcsinvite; public: - CSInvite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsinvite(this) + CSInvite(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsinvite(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp index 870c18f0c..d7251ec6b 100644 --- a/modules/commands/cs_kick.cpp +++ b/modules/commands/cs_kick.cpp @@ -126,9 +126,8 @@ class CSKick : public Module CommandCSKick commandcskick; public: - CSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcskick(this) + CSKick(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcskick(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp index 29c8a827b..72f3e35dc 100644 --- a/modules/commands/cs_list.cpp +++ b/modules/commands/cs_list.cpp @@ -166,9 +166,8 @@ class CSList : public Module CommandCSList commandcslist; public: - CSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcslist(this) + CSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcslist(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp index 41d8229f6..569617ba5 100644 --- a/modules/commands/cs_log.cpp +++ b/modules/commands/cs_log.cpp @@ -185,10 +185,9 @@ class CSLog : public Module CommandCSLog commandcslog; public: - CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSLog(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), MSService("MemoServService", "MemoServ"), commandcslog(this) { - this->SetAuthor("Anope"); Implementation i[] = { I_OnLog }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp index f0f7894cf..513a5410e 100644 --- a/modules/commands/cs_mode.cpp +++ b/modules/commands/cs_mode.cpp @@ -485,10 +485,9 @@ class CSMode : public Module CommandCSMode commandcsmode; public: - CSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsmode(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp index a79942fc3..0a571100c 100644 --- a/modules/commands/cs_register.cpp +++ b/modules/commands/cs_register.cpp @@ -134,10 +134,9 @@ class CSRegister : public Module CommandCSRegister commandcsregister; public: - CSRegister(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSRegister(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsregister(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp index 66706c8fb..7c88c89b8 100644 --- a/modules/commands/cs_seen.cpp +++ b/modules/commands/cs_seen.cpp @@ -324,9 +324,8 @@ class CSSeen : public Module 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) + CSSeen(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), seeninfo_type("SeenInfo", SeenInfo::Unserialize), commandseen(this), commandosseen(this), purger(this) { - this->SetAuthor("Anope"); Implementation eventlist[] = { I_OnReload, I_OnUserConnect, diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 67d024c9f..03aa6c59c 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -1154,14 +1154,13 @@ class CSSet : public Module CommandCSSASetNoexpire commandcssasetnoexpire; public: - CSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsset(this), commandcssaset(this), commandcssetautoop(this), commandcssetbantype(this), commandcssetchanstats(this), CSDefChanstats(false), commandcssetdescription(this), commandcssetfounder(this), commandcssetkeeptopic(this), commandcssetpeace(this), commandcssetpersist(this), commandcssetprivate(this), commandcssetrestricted(this), commandcssetsecure(this), commandcssetsecurefounder(this), commandcssetsecureops(this), commandcssetsignkick(this), commandcssetsuccessor(this), commandcssasetnoexpire(this) { - this->SetAuthor("Anope"); Implementation i[] = { I_OnReload, I_OnChanRegistered, I_OnCheckKick, I_OnDelChan }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp index 3b6e761a7..93897f332 100644 --- a/modules/commands/cs_set_misc.cpp +++ b/modules/commands/cs_set_misc.cpp @@ -135,10 +135,9 @@ class CSSetMisc : public Module CommandCSSetMisc commandcssetmisc; public: - CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSSetMisc(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), csmiscdata_type("CSMiscData", CSMiscData::Unserialize), commandcssetmisc(this) { - this->SetAuthor("Anope"); Implementation i[] = { I_OnReload, I_OnChanInfo }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_status.cpp b/modules/commands/cs_status.cpp index 1d1aa619c..50f7080ac 100644 --- a/modules/commands/cs_status.cpp +++ b/modules/commands/cs_status.cpp @@ -104,9 +104,8 @@ class CSStatus : public Module CommandCSStatus commandcsstatus; public: - CSStatus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandcsstatus(this) + CSStatus(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsstatus(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp index 0ea54879e..4927737f6 100644 --- a/modules/commands/cs_suspend.cpp +++ b/modules/commands/cs_suspend.cpp @@ -164,10 +164,9 @@ class CSSuspend : public Module CommandCSUnSuspend commandcsunsuspend; public: - CSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSSuspend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcssuspend(this), commandcsunsuspend(this) { - this->SetAuthor("Anope"); Implementation i[] = { I_OnPreChanExpire, I_OnCheckKick }; ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation)); diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp index 3983a52d1..9e6dfb0ec 100644 --- a/modules/commands/cs_sync.cpp +++ b/modules/commands/cs_sync.cpp @@ -55,10 +55,9 @@ class CSSync : public Module { CommandCSSync commandcssync; public: - CSSync(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSSync(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcssync(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp index c98c5c958..64e710017 100644 --- a/modules/commands/cs_topic.cpp +++ b/modules/commands/cs_topic.cpp @@ -122,10 +122,9 @@ class CSTopic : public Module CommandCSTopic commandcstopic; public: - CSTopic(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSTopic(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcstopic(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp index eaf371a34..8b90ee93d 100644 --- a/modules/commands/cs_unban.cpp +++ b/modules/commands/cs_unban.cpp @@ -107,10 +107,9 @@ class CSUnban : public Module CommandCSUnban commandcsunban; public: - CSUnban(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSUnban(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsunban(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp index ecce1e51d..8a8f3f336 100644 --- a/modules/commands/cs_updown.cpp +++ b/modules/commands/cs_updown.cpp @@ -166,10 +166,9 @@ class CSUpDown : public Module CommandCSDown commandcsdown; public: - CSUpDown(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSUpDown(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandcsup(this), commandcsdown(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp index 18a2789c7..1cfa033e2 100644 --- a/modules/commands/cs_xop.cpp +++ b/modules/commands/cs_xop.cpp @@ -539,10 +539,9 @@ class CSXOP : public Module CommandCSXOP commandcsxop; public: - CSXOP(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + CSXOP(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), accessprovider(this), commandcsxop(this) { - this->SetAuthor("Anope"); this->SetPermanent(true); this->OnReload(); diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp index 7cc4dbdc8..fae4554d4 100644 --- a/modules/commands/gl_global.cpp +++ b/modules/commands/gl_global.cpp @@ -53,10 +53,9 @@ class GLGlobal : public Module CommandGLGlobal commandglglobal; public: - GLGlobal(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + GLGlobal(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandglglobal(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp index fcac6863c..a55af89ff 100644 --- a/modules/commands/help.cpp +++ b/modules/commands/help.cpp @@ -196,10 +196,9 @@ class Help : public Module CommandHelp commandhelp; public: - Help(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + Help(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhelp(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp index 5df23e721..ad9347ce0 100644 --- a/modules/commands/hs_del.cpp +++ b/modules/commands/hs_del.cpp @@ -92,10 +92,9 @@ class HSDel : public Module CommandHSDelAll commandhsdelall; public: - HSDel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + HSDel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhsdel(this), commandhsdelall(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp index ee997f704..9f7b41d57 100644 --- a/modules/commands/hs_group.cpp +++ b/modules/commands/hs_group.cpp @@ -68,10 +68,9 @@ class HSGroup : public Module CommandHSGroup commandhsgroup; public: - HSGroup(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + HSGroup(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhsgroup(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp index 96e6866f0..94533e73d 100644 --- a/modules/commands/hs_list.cpp +++ b/modules/commands/hs_list.cpp @@ -153,10 +153,9 @@ class HSList : public Module CommandHSList commandhslist; public: - HSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + HSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhslist(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/hs_off.cpp b/modules/commands/hs_off.cpp index 3db3c1adf..ad79dfadc 100644 --- a/modules/commands/hs_off.cpp +++ b/modules/commands/hs_off.cpp @@ -56,10 +56,9 @@ class HSOff : public Module CommandHSOff commandhsoff; public: - HSOff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + HSOff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhsoff(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/hs_on.cpp b/modules/commands/hs_on.cpp index e19482c9a..9f33ac6ac 100644 --- a/modules/commands/hs_on.cpp +++ b/modules/commands/hs_on.cpp @@ -65,10 +65,9 @@ class HSOn : public Module CommandHSOn commandhson; public: - HSOn(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + HSOn(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhson(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp index df104f721..1867dbb77 100644 --- a/modules/commands/hs_request.cpp +++ b/modules/commands/hs_request.cpp @@ -348,10 +348,9 @@ class HSRequest : public Module CommandHSWaiting commandhswaiting; public: - HSRequest(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + HSRequest(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), request_type("HostRequest", HostRequest::Unserialize), commandhsrequest(this), commandhsactive(this), commandhsreject(this), commandhswaiting(this) { - this->SetAuthor("Anope"); if (!IRCD || !IRCD->CanSetVHost) throw ModuleException("Your IRCd does not support vhosts"); diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp index 11ecbca5a..4adc86897 100644 --- a/modules/commands/hs_set.cpp +++ b/modules/commands/hs_set.cpp @@ -211,9 +211,8 @@ class HSSet : public Module CommandHSSetAll commandhssetall; public: - HSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), commandhsset(this), commandhssetall(this) + HSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandhsset(this), commandhssetall(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp index e03883d91..e0e917b5e 100644 --- a/modules/commands/ms_cancel.cpp +++ b/modules/commands/ms_cancel.cpp @@ -78,10 +78,9 @@ class MSCancel : public Module CommandMSCancel commandmscancel; public: - MSCancel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSCancel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmscancel(this) { - this->SetAuthor("Anope"); if (!MemoServService) throw ModuleException("No MemoServ!"); diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp index 984126ee6..9a24e9973 100644 --- a/modules/commands/ms_check.cpp +++ b/modules/commands/ms_check.cpp @@ -76,10 +76,9 @@ class MSCheck : public Module CommandMSCheck commandmscheck; public: - MSCheck(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSCheck(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmscheck(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_del.cpp b/modules/commands/ms_del.cpp index 33175d023..18927f8ee 100644 --- a/modules/commands/ms_del.cpp +++ b/modules/commands/ms_del.cpp @@ -153,10 +153,9 @@ class MSDel : public Module CommandMSDel commandmsdel; public: - MSDel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSDel(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsdel(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp index 41e139eff..d1f33abdf 100644 --- a/modules/commands/ms_ignore.cpp +++ b/modules/commands/ms_ignore.cpp @@ -121,10 +121,9 @@ class MSIgnore : public Module CommandMSIgnore commandmsignore; public: - MSIgnore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSIgnore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsignore(this) { - this->SetAuthor("Anope"); if (!MemoServService) throw ModuleException("No MemoServ!"); diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp index 21ec9ba13..517e6b1ac 100644 --- a/modules/commands/ms_info.cpp +++ b/modules/commands/ms_info.cpp @@ -207,10 +207,9 @@ class MSInfo : public Module CommandMSInfo commandmsinfo; public: - MSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsinfo(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp index 3181f9dff..8b7ebeb62 100644 --- a/modules/commands/ms_list.cpp +++ b/modules/commands/ms_list.cpp @@ -156,10 +156,9 @@ class MSList : public Module CommandMSList commandmslist; public: - MSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmslist(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp index 14b952922..c98708724 100644 --- a/modules/commands/ms_read.cpp +++ b/modules/commands/ms_read.cpp @@ -186,10 +186,9 @@ class MSRead : public Module CommandMSRead commandmsread; public: - MSRead(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSRead(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsread(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp index e5c345c75..782871d84 100644 --- a/modules/commands/ms_rsend.cpp +++ b/modules/commands/ms_rsend.cpp @@ -95,10 +95,9 @@ class MSRSend : public Module CommandMSRSend commandmsrsend; public: - MSRSend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSRSend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsrsend(this) { - this->SetAuthor("Anope"); if (!MemoServService) throw ModuleException("No MemoServ!"); diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp index f92955dcf..15ca4a6ba 100644 --- a/modules/commands/ms_send.cpp +++ b/modules/commands/ms_send.cpp @@ -63,10 +63,9 @@ class MSSend : public Module CommandMSSend commandmssend; public: - MSSend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSSend(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmssend(this) { - this->SetAuthor("Anope"); if (!MemoServService) throw ModuleException("No MemoServ!"); diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp index 59d532bf9..d823f7c5f 100644 --- a/modules/commands/ms_sendall.cpp +++ b/modules/commands/ms_sendall.cpp @@ -64,10 +64,9 @@ class MSSendAll : public Module CommandMSSendAll commandmssendall; public: - MSSendAll(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSSendAll(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmssendall(this) { - this->SetAuthor("Anope"); if (!MemoServService) throw ModuleException("No MemoServ!"); diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp index f2fc15c09..b0a2fb8ba 100644 --- a/modules/commands/ms_set.cpp +++ b/modules/commands/ms_set.cpp @@ -299,10 +299,9 @@ class MSSet : public Module CommandMSSet commandmsset; public: - MSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSSet(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsset(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp index 6a1263fa7..f9d5e81e5 100644 --- a/modules/commands/ms_staff.cpp +++ b/modules/commands/ms_staff.cpp @@ -64,10 +64,9 @@ class MSStaff : public Module CommandMSStaff commandmsstaff; public: - MSStaff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + MSStaff(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandmsstaff(this) { - this->SetAuthor("Anope"); if (!MemoServService) throw ModuleException("No MemoServ!"); diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp index bd26dbb2c..a026314e0 100644 --- a/modules/commands/ns_access.cpp +++ b/modules/commands/ns_access.cpp @@ -181,10 +181,9 @@ class NSAccess : public Module CommandNSAccess commandnsaccess; public: - NSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSAccess(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsaccess(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 3f4d9d3ec..d427e9cf3 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -237,10 +237,9 @@ class NSAJoin : public Module CommandNSAJoin commandnsajoin; public: - NSAJoin(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSAJoin(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), ajoinentry_type("AJoinEntry", AJoinEntry::Unserialize), commandnsajoin(this) { - this->SetAuthor("Anope"); if (!IRCD->CanSVSJoin) throw ModuleException("Your IRCd does not support SVSJOIN"); diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp index c8d7eef0f..9c673a7fc 100644 --- a/modules/commands/ns_alist.cpp +++ b/modules/commands/ns_alist.cpp @@ -121,10 +121,9 @@ class NSAList : public Module CommandNSAList commandnsalist; public: - NSAList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSAList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsalist(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp index bbfbdd3e8..1191aaa9b 100644 --- a/modules/commands/ns_cert.cpp +++ b/modules/commands/ns_cert.cpp @@ -219,10 +219,9 @@ class NSCert : public Module } public: - NSCert(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSCert(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnscert(this) { - this->SetAuthor("Anope"); if (!IRCD || !IRCD->CanCertFP) throw ModuleException("Your IRCd does not support ssl client certificates"); diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp index e52ca5681..cc03b1001 100644 --- a/modules/commands/ns_drop.cpp +++ b/modules/commands/ns_drop.cpp @@ -112,10 +112,9 @@ class NSDrop : public Module CommandNSDrop commandnsdrop; public: - NSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsdrop(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_getemail.cpp b/modules/commands/ns_getemail.cpp index 7728f3178..386940a0a 100644 --- a/modules/commands/ns_getemail.cpp +++ b/modules/commands/ns_getemail.cpp @@ -69,10 +69,9 @@ class NSGetEMail : public Module { CommandNSGetEMail commandnsgetemail; public: - NSGetEMail(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSGetEMail(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsgetemail(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_getpass.cpp b/modules/commands/ns_getpass.cpp index 987e98827..aad6fb55b 100644 --- a/modules/commands/ns_getpass.cpp +++ b/modules/commands/ns_getpass.cpp @@ -62,10 +62,9 @@ class NSGetPass : public Module CommandNSGetPass commandnsgetpass; public: - NSGetPass(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSGetPass(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsgetpass(this) { - this->SetAuthor("Anope"); Anope::string tmp_pass = "plain:tmp"; if (Anope::Decrypt(tmp_pass, tmp_pass) == -1) diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp index b8191046a..090b47fd4 100644 --- a/modules/commands/ns_group.cpp +++ b/modules/commands/ns_group.cpp @@ -348,10 +348,9 @@ class NSGroup : public Module CommandNSGList commandnsglist; public: - NSGroup(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSGroup(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsgroup(this), commandnsungroup(this), commandnsglist(this) { - this->SetAuthor("Anope"); if (Config->NoNicknameOwnership) throw ModuleException(modname + " can not be used with options:nonicknameownership enabled"); diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp index adbe97de5..037072728 100644 --- a/modules/commands/ns_identify.cpp +++ b/modules/commands/ns_identify.cpp @@ -109,10 +109,9 @@ class NSIdentify : public Module CommandNSIdentify commandnsidentify; public: - NSIdentify(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSIdentify(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsidentify(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp index fddb9c5ad..171937730 100644 --- a/modules/commands/ns_info.cpp +++ b/modules/commands/ns_info.cpp @@ -164,10 +164,9 @@ class NSInfo : public Module CommandNSInfo commandnsinfo; public: - NSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSInfo(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnsinfo(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp index b96b21412..d1887f287 100644 --- a/modules/commands/ns_list.cpp +++ b/modules/commands/ns_list.cpp @@ -182,10 +182,9 @@ class NSList : public Module CommandNSList commandnslist; public: - NSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSList(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnslist(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp index 1147b390f..cdeab3add 100644 --- a/modules/commands/ns_logout.cpp +++ b/modules/commands/ns_logout.cpp @@ -84,10 +84,9 @@ class NSLogout : public Module CommandNSLogout commandnslogout; public: - NSLogout(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), + NSLogout(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR), commandnslogout(this) { - this->SetAuthor("Anope"); } }; diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp index ee54f3b3f..669d26da9 100644 --- a/modules/commands/ns_recover.cpp +++ b/modules/com