inspircd

A modular C++ IRC daemon (ircd). https://www.inspircd.org/
Log | Files | Refs | README

commit e57d1b19ff4823b7885eb7f4d3b37c84d2edca0e
parent 2533dc10f987eedb99d780c7debd948f22705679
Author: Robby <Robby-@users.noreply.github.com>
Date:   Sun, 28 Apr 2019 10:14:21 +0200

Textual improvements and fixes such as typos, casing, etc. (#1612)


Diffstat:
Mconfigure | 2+-
Mdocs/conf/helpop.conf.example | 63++++++++++++++++++++++++++++++++-------------------------------
Mdocs/conf/inspircd.conf.example | 8++++----
Mdocs/conf/modules.conf.example | 38++++++++++++++++++++------------------
Mdocs/conf/opers.conf.example | 4++--
Mdocs/conf/quotes.txt.example | 2+-
Minclude/inspircd.h | 8++++----
Minclude/logger.h | 2+-
Minclude/numerics.h | 4++--
Minclude/protocol.h | 4++--
Msrc/channels.cpp | 2+-
Msrc/coremods/core_channel/core_channel.cpp | 6+++---
Msrc/coremods/core_dns.cpp | 2+-
Msrc/coremods/core_info/cmd_admin.cpp | 6+++---
Msrc/coremods/core_info/cmd_info.cpp | 16++++++++--------
Msrc/coremods/core_oper/cmd_die.cpp | 2+-
Msrc/coremods/core_oper/cmd_restart.cpp | 2+-
Msrc/coremods/core_whois.cpp | 4++--
Msrc/coremods/core_xline/cmd_eline.cpp | 2+-
Msrc/coremods/core_xline/cmd_gline.cpp | 2+-
Msrc/coremods/core_xline/cmd_kline.cpp | 2+-
Msrc/coremods/core_xline/cmd_qline.cpp | 2+-
Msrc/coremods/core_xline/cmd_zline.cpp | 2+-
Msrc/coremods/core_xline/core_xline.cpp | 2+-
Msrc/modules/extra/m_ldap.cpp | 2+-
Msrc/modules/extra/m_mysql.cpp | 2+-
Msrc/modules/extra/m_regex_stdlib.cpp | 2+-
Msrc/modules/m_abbreviation.cpp | 2+-
Msrc/modules/m_alias.cpp | 6+++---
Msrc/modules/m_allowinvite.cpp | 2+-
Msrc/modules/m_anticaps.cpp | 2+-
Msrc/modules/m_banredirect.cpp | 6+++---
Msrc/modules/m_blockamsg.cpp | 6+++---
Msrc/modules/m_callerid.cpp | 4++--
Msrc/modules/m_cban.cpp | 4++--
Msrc/modules/m_chanlog.cpp | 4++--
Msrc/modules/m_clearchan.cpp | 2+-
Msrc/modules/m_clones.cpp | 2+-
Msrc/modules/m_connectban.cpp | 2+-
Msrc/modules/m_customprefix.cpp | 2+-
Msrc/modules/m_customtitle.cpp | 2+-
Msrc/modules/m_cycle.cpp | 2+-
Msrc/modules/m_dccallow.cpp | 2+-
Msrc/modules/m_deaf.cpp | 6+++---
Msrc/modules/m_delayjoin.cpp | 2+-
Msrc/modules/m_delaymsg.cpp | 6+++---
Msrc/modules/m_disable.cpp | 4++--
Msrc/modules/m_exemptchanops.cpp | 2+-
Msrc/modules/m_filter.cpp | 2+-
Msrc/modules/m_globalload.cpp | 2+-
Msrc/modules/m_helpop.cpp | 2+-
Msrc/modules/m_httpd_acl.cpp | 2+-
Msrc/modules/m_knock.cpp | 2+-
Msrc/modules/m_ldapauth.cpp | 6+++---
Msrc/modules/m_maphide.cpp | 2+-
Msrc/modules/m_mlock.cpp | 4++--
Msrc/modules/m_modenotice.cpp | 2+-
Msrc/modules/m_namedmodes.cpp | 2+-
Msrc/modules/m_namesx.cpp | 2+-
Msrc/modules/m_nickflood.cpp | 2+-
Msrc/modules/m_nokicks.cpp | 2+-
Msrc/modules/m_operchans.cpp | 2+-
Msrc/modules/m_operlevels.cpp | 6+++---
Msrc/modules/m_operlog.cpp | 2+-
Msrc/modules/m_opermotd.cpp | 8++++----
Msrc/modules/m_operprefix.cpp | 2+-
Msrc/modules/m_randquote.cpp | 2+-
Msrc/modules/m_redirect.cpp | 2+-
Msrc/modules/m_regex_glob.cpp | 2+-
Msrc/modules/m_remove.cpp | 8++++----
Msrc/modules/m_restrictmsg.cpp | 4++--
Msrc/modules/m_rline.cpp | 10+++++-----
Msrc/modules/m_sapart.cpp | 2+-
Msrc/modules/m_sasl.cpp | 2+-
Msrc/modules/m_services_account.cpp | 4++--
Msrc/modules/m_servprotect.cpp | 2+-
Msrc/modules/m_shun.cpp | 6+++---
Msrc/modules/m_silence.cpp | 4++--
Msrc/modules/m_spanningtree/addline.cpp | 6+++---
Msrc/modules/m_spanningtree/ijoin.cpp | 2+-
Msrc/modules/m_spanningtree/netburst.cpp | 4++--
Msrc/modules/m_spanningtree/opertype.cpp | 2+-
Msrc/modules/m_spanningtree/server.cpp | 16++++++++--------
Msrc/modules/m_spanningtree/treeserver.cpp | 2+-
Msrc/modules/m_spanningtree/treeserver.h | 2+-
Msrc/modules/m_spanningtree/treesocket1.cpp | 4++--
Msrc/modules/m_spanningtree/treesocket2.cpp | 8++++----
Msrc/modules/m_sqlauth.cpp | 6+++---
Msrc/modules/m_sqloper.cpp | 2+-
Msrc/modules/m_sslmodes.cpp | 6+++---
Msrc/modules/m_stripcolor.cpp | 2+-
Msrc/modules/m_svshold.cpp | 4++--
Msrc/modules/m_tline.cpp | 2+-
Msrc/modules/m_uhnames.cpp | 2+-
Msrc/modules/m_xline_db.cpp | 2+-
Msrc/users.cpp | 2+-
96 files changed, 220 insertions(+), 217 deletions(-)

diff --git a/configure b/configure @@ -254,7 +254,7 @@ $config{UID} = $user[2]; # Warn the user about clock drifting when running on OpenVZ. if (-e '/proc/user_beancounters' || -e '/proc/vz/vzaquota') { print_warning <<'EOW'; -You are building InspIRCd inside of an an OpenVZ container. If you +You are building InspIRCd inside of an OpenVZ container. If you plan to use InspIRCd in this container then you should make sure that NTP is configured on the Hardware Node. Failure to do so may result in clock drifting! EOW diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example @@ -79,7 +79,7 @@ format are optional."> <helpop key="accept" value="/ACCEPT *|(+|-)<nick>[,(+|-)<nick>]+ Manages your accept list. This list is used to determine who can -private message you when you have usermode +g set. +private message you when you have user mode +g set. /ACCEPT * - List accepted nicks /ACCEPT +<nick> - Add a nick @@ -145,7 +145,7 @@ E.g. '/RMODE #channel b m:*' will remove all mute extbans on the channel."> This behaves identically to /REMOVE. /REMOVE is a built-in mIRC command which caused trouble for some users."> -<helpop key="silence" value="/SILENCE [(+|-)<mask> [CcdiNnPpsTtx]+] +<helpop key="silence" value="/SILENCE [(+|-)<mask> [CcdiNnPpTtx]] A server-side ignore of the given n!u@h mask. If the optional flags field is specified then it must contain one or more flags which specify what kind of @@ -157,16 +157,16 @@ messages should be blocked and how they should be blocked. Valid SILENCE Flags ------------------- - c Matches a CTCP targeted at a channel. C Matches a CTCP targeted at a user. + c Matches a CTCP targeted at a channel. d Default behaviour; equivalent to CciNnPpTt. i Matches an invite to a channel. - n Matches a NOTICE targeted at a channel. N Matches a NOTICE targeted at a user. - p Matches a PRIVMSG targeted at a channel. + n Matches a NOTICE targeted at a channel. P Matches a PRIVMSG targeted at a user. - t Matches a TAGMSG targeted at a channel. + p Matches a PRIVMSG targeted at a channel. T Matches a TAGMSG targeted at a user. + t Matches a TAGMSG targeted at a channel. x Exempt the mask from silence rules. Any combination of flags is valid."> @@ -243,7 +243,7 @@ Change or view modes of <target>. Sets the mode for a channel or a nickname specified in <target>. A user may only set modes upon themselves, and may not set the -+o usermode, and a user may only change channel modes of ++o user mode, and a user may only change channel modes of channels where they are at least a halfoperator. For a list of all user and channel modes, enter /HELPOP UMODES or @@ -343,10 +343,10 @@ to using a server."> <helpop key="oper" value="/OPER <username> <password> -Attempts to authenticate a user as an IRC operator. +Attempts to authenticate as a server operator. Both successful and unsuccessful oper attempts are -logged, and sent to online IRC operators."> +logged, and sent to online server operators."> <helpop key="list" value="/LIST [<pattern>] @@ -461,8 +461,8 @@ Returns the IP address and nickname of the given user(s)."> This command returns the number of local and global clients matched, and the percentage of clients matched, plus how they were matched -(by IP address or by hostname). Mask should be given as either a -nick!user@host or user@IP (wildcards accepted)."> +(by IP address or by hostname). Mask should be given as either +nick!user@host or user@IP (wildcards and CIDR blocks are accepted)."> <helpop key="lockserv" value="/LOCKSERV [:<message>] @@ -488,11 +488,11 @@ Valid FILTER Actions -------------------- None Does nothing -Warn Lets the message through and informs +s IRCops of the message - and all relevant info -Block Blocks message and informs +s IRCops of the blocked message - and all relevant info -Silent Blocks message, but does not notify IRCops +Warn Lets the message through and informs +s server operators + of the message and all relevant info +Block Blocks message and informs +s server operators of the blocked + message and all relevant info +Silent Blocks message, but does not notify server operators Kill Kills the user Gline G-lines the user for the specified duration Zline Z-lines the user for the specified duration @@ -832,16 +832,16 @@ using their cloak when they quit."> from channels they are in (requires the deaf module). g In combination with /ACCEPT, provides for server-side ignore (requires the callerid module). - h Marks as 'available for help' in WHOIS (IRCop only, - requires the helpop module). + h Marks as 'available for help' in WHOIS (server operators + only, requires the helpop module). i Makes invisible to /WHO if the user using /WHO is not in a common channel. k Prevents the user from being kicked from channels, or having op modes removed from them (services only, requires the servprotect module). - o Marks as a IRC operator. + o Marks as a server operator. s <mask> Receives server notices specified by <mask> - (IRCop only). + (server operators only). r Marks as a having a registered nickname (requires the services account module). w Receives wallops messages. @@ -856,15 +856,15 @@ using their cloak when they quit."> H Hides an oper's oper status from WHOIS (requires the hideoper module). I Hides a user's entire channel list in WHOIS from - non-IRCops (requires the hidechans module). + non-server operators (requires the hidechans module). L Stops redirections done by the redirect module (requires the redirect module). R Blocks private messages from unregistered users (requires the services account module). S Strips formatting codes out of private messages to the user (requires the stripcolor module). - W Receives notification when a user uses WHOIS on them - (IRCop only, requires the showwhois module)."> + W Receives notifications when a user uses WHOIS on them + (server operators only, requires the showwhois module)."> <helpop key="chmodes" value="Channel Modes ------------- @@ -963,12 +963,12 @@ using their cloak when they quit."> the services account module). N Prevents users on the channel from changing nick (requires the nonicks module). - O Channel is IRCops only (can only be set by IRCops, - requires the operchans module). + O Channel is server operators only (can only be set + by server operators, requires the operchans module). P Makes the channel permanent; Bans, invites, the topic, modes, and such will not be lost when it - empties (can only be set by IRCops, requires - the permchannels module). + empties (can only be set by server operators, + requires the permchannels module). Q Only U-lined servers and their users can kick (requires the nokicks module). R Blocks unregistered users from joining (requires @@ -1042,7 +1042,7 @@ E Show socket engine events S Show currently held registered nicknames G Show how many local users are connected from each country -Note that all /STATS use is broadcast to online IRC operators."> +Note that all /STATS use is broadcast to online server operators."> <helpop key="snomasks" value="Server Notice Masks @@ -1090,7 +1090,7 @@ setting +I <extban>. Matching extbans: - a:<mask> Matches user with both a matching banmask and realname, + a:<mask> Matches user with both a matching banmask and real name, where <mask> is in the format nick!user@host+realname (requires gecosban module). j:<channel> Matches anyone in the given channel. Does not support @@ -1103,8 +1103,9 @@ Matching extbans: serverban module). z:<certfp> Matches users having the given SSL certificate fingerprint (requires the sslmodes module). - O:<opertype> Matches IRCops of a matching type, mostly useful as an - an invite exception (requires the operchans module). + O:<opertype> Matches server operators of a matching type, mostly + useful as an invite exception (requires the + operchans module). R:<account> Matches users logged into a matching account (requires the services account module). U:<banmask> Matches unregistered users matching the given banmask. diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example @@ -298,7 +298,7 @@ # limit: How many users are allowed in this class limit="5000" - # modes: Usermodes that are set on users in this block on connect. + # modes: User modes that are set on users in this block on connect. # Enabling this option requires that the conn_umodes module be loaded. # This entry is highly recommended to use for/with IP cloaking/masking. # For the example to work, this also requires that the cloaking @@ -412,7 +412,7 @@ # limit: How many users are allowed in this class limit="5000" - # modes: Usermodes that are set on users in this block on connect. + # modes: User modes that are set on users in this block on connect. # Enabling this option requires that the conn_umodes module be loaded. # This entry is highly recommended to use for/with IP cloaking/masking. # For the example to work, this also requires that the cloaking @@ -772,7 +772,7 @@ restrictbannedusers="yes" # genericoper: Setting this value to yes makes all opers on this server - # appear as 'is an IRC operator' in their WHOIS, regardless of their + # appear as 'is a server operator' in their WHOIS, regardless of their # oper type, however oper types are still used internally. This only # affects the display in WHOIS. genericoper="no" @@ -945,7 +945,7 @@ <exception # host: ident@hostname to exempt. # Wildcards and CIDR (if you specify an IP) can be used. - host="*@ircop.example.com" + host="*@serverop.example.com" # reason: Reason for exception. Only shown in /STATS e. reason="Oper's hostname"> diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example @@ -117,9 +117,9 @@ # the user receives a 'no such nick' 401 numeric. # # # # uline - Setting this to true will ensure that the user # -# given in 'requires' is also on a u-lined server, # +# given in 'requires' is also on a U-lined server, # # as well as actually being on the network. If the # -# user is online, but not on a u-lined server, # +# user is online, but not on a U-lined server, # # then an oper alert is sent out as this is # # possibly a sign of a user trying to impersonate # # a service. # @@ -282,7 +282,7 @@ #<module name="botmode"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# CallerID module: Adds usermode +g which activates hybrid-style +# CallerID module: Adds user mode +g which activates hybrid-style # callerid: block all private messages unless you /ACCEPT first. #<module name="callerid"> # @@ -510,7 +510,7 @@ #<module name="clearchan"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Cloaking module: Adds usermode +x and cloaking support. +# Cloaking module: Adds user mode +x and cloaking support. # Relies on the md5 module being loaded. # To cloak users when they connect, load the conn_umodes module and set # <connect:modes> to include the +x mode. The example <connect> tag @@ -719,7 +719,7 @@ #<banfile pattern="*.txt" action="allow"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Deaf module: Adds support for the usermodes +dD: +# Deaf module: Adds support for user modes +d and +D: # d - deaf to channel messages and notices. # D - deaf to user messages and notices. # The +D user mode is not enabled by default to enable link compatibility @@ -733,8 +733,8 @@ # the starting character of a message. # If 'bypasscharsuline' is empty, then 'bypasschars' will # match for both regular and U-lined users. -# enableprivdeaf - Whether to enable usermode +D (privdeaf). -# privdeafuline - Whether U-lined users bypass usermode +D (privdeaf). +# enableprivdeaf - Whether to enable user mode +D (privdeaf). +# privdeafuline - Whether U-lined users bypass user mode +D (privdeaf). # #<deaf bypasschars="" bypasscharsuline="!" enableprivdeaf="no" privdeafuline="yes"> @@ -1499,26 +1499,26 @@ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Oper prefixing module: Adds a channel prefix mode +y which is given -# to all IRC operators automatically on all channels they are in. +# to all server operators automatically on all channels they are in. # This prefix mode is more powerful than channel op and other regular # prefix modes. # -# Load this module if you want all your IRC operators to have channel -# operator powers. +# Load this module if you want all your server operators to have +# channel operator powers. #<module name="operprefix"> # # You may additionally customise the prefix character. #<operprefix prefix="!"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Oper MOTD module: Provides support for separate message of the day +# Oper MOTD module: Provides support for a separate message of the day # on oper-up. # This module is oper-only. #<module name="opermotd"> # #-#-#-#-#-#-#-#-#-#-# OPERMOTD CONFIGURATION -#-#-#-#-#-#-#-#-#-#-# # # -# If you are using the opermotd module, specify the motd here. # +# If you are using the opermotd module, specify the motd file here. # # # # onoper - If on, the message is sent on /OPER, otherwise it's # # only sent when /OPERMOTD is used. # @@ -1540,9 +1540,9 @@ # via channel notice. # # # # requirekey - If enabled, overriding on join requires a channel # -# key of "override" to be specified # +# key of "override" to be specified. # # # -# enableumode - If enabled, usermode +O is required for override. # +# enableumode - If enabled, user mode +O is required for override. # # # #<override noisy="yes" requirekey="no" enableumode="true"> @@ -1807,13 +1807,15 @@ # If you wish to re-check a user when they change nickname (can be # useful under some situations, but *can* also use CPU with more users # on a server) then set 'matchonnickchange' to yes. +# If you additionally want Z-lines to be added on matches, then +# set 'zlineonmatch' to yes. # Also, this is where you set what Regular Expression engine is to be # used. If you ever change it while running, all of your R-lines will # be wiped. This is the regex engine used by all R-lines set, and # regex_<engine> must be loaded, or rline will be non-functional # until you load it or change the engine to one that is loaded. # -#<rline matchonnickchange="yes" engine="pcre"> +#<rline matchonnickchange="yes" zlineonmatch="no" engine="pcre"> # # Generally, you will NOT want to use 'glob' here, as this turns an # R-line into just another G-line. The exceptions are that R-lines will @@ -1931,7 +1933,7 @@ #<module name="setidle"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Services support module: Adds several usermodes such as +R and +M. +# Services support module: Adds several user modes such as +R and +M. # This module implements the 'identified' state via account names, # and is similar in operation to the way asuka and ircu handle services. # @@ -2018,7 +2020,7 @@ # endtext="End of server rules."> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# Show whois module: Adds the +W usermode which allows opers to see +# Show whois module: Adds the +W user mode which allows opers to see # when they are /WHOIS'd. # This module is oper-only by default. #<module name="showwhois"> @@ -2274,7 +2276,7 @@ # <wsorigin allow="https://*.example.com/"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -# XLine database: Stores all *-lines (G/Z/K/R/any added by other modules) +# X-line database: Stores all *-lines (G/Z/K/R/any added by other modules) # in a file which is re-loaded on restart. This is useful # for two reasons: it keeps bans so users may not evade them, and on # bigger networks, server connections will take less time as there will diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf.example @@ -44,7 +44,7 @@ # *NOTE: These privs are potentially dangerous, as they grant users with them the ability to hammer your server's CPU/RAM as much as they want, essentially. privs="users/auspex channels/auspex servers/auspex users/mass-message users/flood/no-throttle users/flood/increased-buffers" - # usermodes: Oper-only usermodes that opers with this class can use. + # usermodes: Oper-only user modes that opers with this class can use. usermodes="*" # chanmodes: Oper-only channel modes that opers with this class can use. @@ -82,7 +82,7 @@ # Requires the opermodes module to be loaded. modes="+s +cCqQ"> -<type name="GlobalOp" classes="SACommands OperChat BanControl HostCloak ServerLink" vhost="ircop.omega.example.org"> +<type name="GlobalOp" classes="SACommands OperChat BanControl HostCloak ServerLink" vhost="serverop.omega.example.org"> <type name="Helper" classes="HostCloak" vhost="helper.omega.example.org"> diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt.example @@ -82,7 +82,7 @@ It just keeps going and going and going and going and goi <BANG> All that I know is that nukes are comming from 127.0.0.1 I know all about the irc and the mirc cops. M re ink n ed d, ple s r fil -Please refrain from feeding the IRC Operators. Thank you. +Please refrain from feeding the server operators. Thank you. I know all about mirc stuff, hmm.. I think this channel is experiencing packet loss.. MacDonalds claims Macintosh stole their next idea of the iMac I can't hold her any longer, captain, she's gonna bl.. sorry, got caught up in the moment diff --git a/include/inspircd.h b/include/inspircd.h @@ -300,7 +300,7 @@ class CoreExport InspIRCd */ std::vector<ListenSocket*> ports; - /** Set to the current signal recieved + /** Set to the current signal received */ static sig_atomic_t s_signal; @@ -403,12 +403,12 @@ class CoreExport InspIRCd static bool IsSID(const std::string& sid); /** Handles incoming signals after being set - * @param signal the signal recieved + * @param signal the signal received */ void SignalHandler(int signal); - /** Sets the signal recieved - * @param signal the signal recieved + /** Sets the signal received + * @param signal the signal received */ static void SetSignal(int signal); diff --git a/include/logger.h b/include/logger.h @@ -202,7 +202,7 @@ class CoreExport LogManager : public fakederef<LogManager> */ bool AddLogType(const std::string &type, LogStream *l, bool autoclose); - /** Removes a logstream from the core. After removal, it will not recieve further events. + /** Removes a logstream from the core. After removal, it will not receive further events. * If the LogStream was ever added with autoclose, it will be closed after this call (this means the pointer won't be valid anymore). */ void DelLogStream(LogStream* l); diff --git a/include/numerics.h b/include/numerics.h @@ -124,7 +124,7 @@ enum /* * A quick side-rant about the next group of numerics.. - * There are clients out there that like to assume that just because they don't recieve a numeric + * There are clients out there that like to assume that just because they don't receive a numeric * they know, that they have joined the channel. * * If IRC was at all properly standardised, this may even be a semi-acceptable assumption to make, @@ -133,7 +133,7 @@ enum * instead! * * tl;dr version: - * DON'T MAKE YOUR CLIENT ASSUME YOU JOINED UNLESS YOU RECIEVE A JOIN WITH YOUR DAMN NICK ON IT. + * DON'T MAKE YOUR CLIENT ASSUME YOU JOINED UNLESS YOU RECEIVE A JOIN WITH YOUR DAMN NICK ON IT. * Thanks. * * -- A message from the IRC group for coder sanity, and w00t diff --git a/include/protocol.h b/include/protocol.h @@ -104,7 +104,7 @@ class CoreExport ProtocolInterface /** Send a message to a channel. * @param target The channel to message. - * @param status The status character (e.g. %) required to recieve. + * @param status The status character (e.g. %) required to receive. * @param text The message to send. * @param type The message type (MSG_PRIVMSG or MSG_NOTICE) */ @@ -119,7 +119,7 @@ class CoreExport ProtocolInterface /** Send a notice to a channel. * @param target The channel to message. - * @param status The status character (e.g. %) required to recieve. + * @param status The status character (e.g. %) required to receive. * @param text The message to send. */ void SendChannelNotice(Channel* target, char status, const std::string &text) diff --git a/src/channels.cpp b/src/channels.cpp @@ -242,7 +242,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co { if (chan->IsBanned(user)) { - user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You're banned)"); + user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)"); return NULL; } } diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp @@ -244,7 +244,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, keygiven))) { // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled) - user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)"); + user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (incorrect channel key)"); return MOD_RES_DENY; } } @@ -256,7 +256,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan)); if (MOD_RESULT != MOD_RES_ALLOW) { - user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)"); + user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (invite only)"); return MOD_RES_DENY; } } @@ -268,7 +268,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan)); if (!MOD_RESULT.check(chan->GetUserCounter() < static_cast<size_t>(limitmode.ext.get(chan)))) { - user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)"); + user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (channel is full)"); return MOD_RES_DENY; } } diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp @@ -36,7 +36,7 @@ namespace DNS using namespace DNS; -/** A full packet sent or recieved to/from the nameserver +/** A full packet sent or received to/from the nameserver */ class Packet : public Query { diff --git a/src/coremods/core_info/cmd_admin.cpp b/src/coremods/core_info/cmd_admin.cpp @@ -36,8 +36,8 @@ CmdResult CommandAdmin::Handle(User* user, const Params& parameters) return CMD_SUCCESS; user->WriteRemoteNumeric(RPL_ADMINME, ServerInstance->Config->ServerName, "Administrative info"); if (!AdminName.empty()) - user->WriteRemoteNumeric(RPL_ADMINLOC1, InspIRCd::Format("Name - %s", AdminName.c_str())); - user->WriteRemoteNumeric(RPL_ADMINLOC2, InspIRCd::Format("Nickname - %s", AdminNick.c_str())); - user->WriteRemoteNumeric(RPL_ADMINEMAIL, InspIRCd::Format("E-Mail - %s", AdminEmail.c_str())); + user->WriteRemoteNumeric(RPL_ADMINLOC1, InspIRCd::Format("Name: %s", AdminName.c_str())); + user->WriteRemoteNumeric(RPL_ADMINLOC2, InspIRCd::Format("Nickname: %s", AdminNick.c_str())); + user->WriteRemoteNumeric(RPL_ADMINEMAIL, InspIRCd::Format("Email: %s", AdminEmail.c_str())); return CMD_SUCCESS; } diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp @@ -31,14 +31,14 @@ CommandInfo::CommandInfo(Module* parent) } static const char* const lines[] = { - " -/\\- \2InspIRCd\2 -\\/-", + " -/\\- \002InspIRCd\002 -\\/-", " November 2002 - Present", " ", - "\2Core Developers\2:", + "\002Core Developers\002:", " Attila Molnar, Attila, <attilamolnar@hush.com>", " Peter Powell, SaberUK, <petpow@saberuk.com>", " ", - "\2Former Developers\2:", + "\002Former Developers\002:", " Oliver Lupton, Om, <om@inspircd.org>", " John Brooks, Special, <special@inspircd.org>", " Dennis Friis, peavey, <peavey@inspircd.org>", @@ -47,15 +47,15 @@ static const char* const lines[] = { " Matt Smith, dz, <dz@inspircd.org>", " Daniel De Graaf, danieldg, <danieldg@inspircd.org>", " ", - "\2Founding Developers\2:", + "\002Founding Developers\002:", " Craig Edwards, Brain, <brain@inspircd.org>", " Craig McLure, Craig, <craig@inspircd.org>", " Robin Burchell, w00t, <w00t@inspircd.org>", " ", - "\2Active Contributors\2:", + "\002Active Contributors\002:", " Adam linuxdaemon Sheogorath", " ", - "\2Former Contributors\2:", + "\002Former Contributors\002:", " dmb Zaba skenmy GreenReaper", " Dan Jason satmd owine", " Adremelech John2 jilles HiroP", @@ -67,10 +67,10 @@ static const char* const lines[] = { " Namegduf Ankit Phoenix Taros", " jackmcbarn ChrisTX Shawn Shutter", " ", - "\2Thanks To\2:", + "\002Thanks To\002:", " Asmo Brik fraggeln genius3000", " ", - " Best experienced with: \2An IRC client\2", + " Best experienced with: \002An IRC client\002", NULL }; diff --git a/src/coremods/core_oper/cmd_die.cpp b/src/coremods/core_oper/cmd_die.cpp @@ -67,7 +67,7 @@ CmdResult CommandDie::Handle(User* user, const Params& parameters) else { ServerInstance->Logs->Log(MODNAME, LOG_SPARSE, "Failed /DIE command from %s", user->GetFullRealHost().c_str()); - ServerInstance->SNO->WriteGlobalSno('a', "Failed DIE Command from %s.", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "Failed DIE command from %s.", user->GetFullRealHost().c_str()); return CMD_FAILURE; } return CMD_SUCCESS; diff --git a/src/coremods/core_oper/cmd_restart.cpp b/src/coremods/core_oper/cmd_restart.cpp @@ -59,7 +59,7 @@ CmdResult CommandRestart::Handle(User* user, const Params& parameters) } else { - ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART Command from %s.", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "Failed RESTART command from %s.", user->GetFullRealHost().c_str()); } return CMD_FAILURE; } diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp @@ -88,7 +88,7 @@ class CommandWhois : public SplitCommand void SendChanList(WhoisContextImpl& whois); public: - /** If true then all opers are shown with a generic 'is an IRC operator' line rather than the oper type. */ + /** If true then all opers are shown with a generic 'is a server operator' line rather than the oper type. */ bool genericoper; /** How to handle private/secret channels in the WHOIS response. */ @@ -242,7 +242,7 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned if (dest->IsOper()) { if (genericoper) - whois.SendLine(RPL_WHOISOPERATOR, "is an IRC operator"); + whois.SendLine(RPL_WHOISOPERATOR, "is a server operator"); else whois.SendLine(RPL_WHOISOPERATOR, InspIRCd::Format("is %s %s on %s", (strchr("AEIOUaeiou",dest->oper->name[0]) ? "an" : "a"), dest->oper->name.c_str(), ServerInstance->Config->Network.c_str())); } diff --git a/src/coremods/core_xline/cmd_eline.cpp b/src/coremods/core_xline/cmd_eline.cpp @@ -94,7 +94,7 @@ CmdResult CommandEline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** E-line " + target + " not found in list, try /stats e."); + user->WriteNotice("*** E-line " + target + " not found on the list."); } } diff --git a/src/coremods/core_xline/cmd_gline.cpp b/src/coremods/core_xline/cmd_gline.cpp @@ -103,7 +103,7 @@ CmdResult CommandGline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** G-line " + target + " not found in list, try /stats g."); + user->WriteNotice("*** G-line " + target + " not found on the list."); } } diff --git a/src/coremods/core_xline/cmd_kline.cpp b/src/coremods/core_xline/cmd_kline.cpp @@ -102,7 +102,7 @@ CmdResult CommandKline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** K-line " + target + " not found in list, try /stats k."); + user->WriteNotice("*** K-line " + target + " not found on the list."); } } diff --git a/src/coremods/core_xline/cmd_qline.cpp b/src/coremods/core_xline/cmd_qline.cpp @@ -81,7 +81,7 @@ CmdResult CommandQline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** Q-line " + parameters[0] + " not found in list, try /stats q."); + user->WriteNotice("*** Q-line " + parameters[0] + " not found on the list."); return CMD_FAILURE; } } diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp @@ -99,7 +99,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** Z-line " + target + " not found in list, try /stats Z."); + user->WriteNotice("*** Z-line " + target + " not found on the list."); return CMD_FAILURE; } } diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp @@ -38,7 +38,7 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User float percent = ((float)matches / (float)ServerInstance->Users->GetUsers().size()) * 100; if (percent > itrigger) { - ServerInstance->SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a %s-line mask of %s, which covers %.2f%% of the network!", user->nick.c_str(), bantype, mask.c_str(), percent); + ServerInstance->SNO->WriteToSnoMask('a', "\002WARNING\002: %s tried to set a %s-line mask of %s, which covers %.2f%% of the network!", user->nick.c_str(), bantype, mask.c_str(), percent); return true; } return false; diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp @@ -617,7 +617,7 @@ class ModuleLDAP : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("LDAP support", VF_VENDOR); + return Version("Provides LDAP support", VF_VENDOR); } }; diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp @@ -500,7 +500,7 @@ void ModuleSQL::OnUnloadModule(Module* mod) Version ModuleSQL::GetVersion() { - return Version("MySQL support", VF_VENDOR); + return Version("Provides MySQL support", VF_VENDOR); } void DispatcherThread::Run() diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp @@ -87,7 +87,7 @@ public: else { if (!stdalgo::string::equalsci(regextype, "ecmascript")) - ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Non-existent regex engine '%s' specified. Falling back to ECMAScript.", regextype.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "WARNING: Nonexistent regex engine '%s' specified. Falling back to ECMAScript.", regextype.c_str()); ref.regextype = std::regex::ECMAScript; } } diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp @@ -35,7 +35,7 @@ class ModuleAbbreviation : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR); + return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords", VF_VENDOR); } ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp @@ -113,7 +113,7 @@ class ModuleAlias : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides aliases of commands.", VF_VENDOR); + return Version("Provides aliases of commands", VF_VENDOR); } std::string GetVar(std::string varname, const std::string &original_line) @@ -282,8 +282,8 @@ class ModuleAlias : public Module if ((a->ULineOnly) && (!u->server->IsULine())) { - ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a u-lined server, possibly underhanded antics detected!"); - user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is an imposter! Please inform an IRC operator as soon as possible."); + ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+a->AliasedCommand+" is not on a U-lined server, possibly underhanded antics detected!"); + user->WriteNumeric(ERR_NOSUCHNICK, a->RequiredNick, "is an imposter! Please inform a server operator as soon as possible."); return 1; } } diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp @@ -57,7 +57,7 @@ class ModuleAllowInvite : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it",VF_VENDOR); + return Version("Provides support for channel mode +A, allowing /INVITE freely on a channel, and extban A to deny specific users it", VF_VENDOR); } }; diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp @@ -297,7 +297,7 @@ class ModuleAntiCaps : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for punishing users that send capitalised messages.", VF_COMMON|VF_VENDOR); + return Version("Provides support for punishing users that send capitalised messages", VF_COMMON|VF_VENDOR); } }; diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp @@ -325,13 +325,13 @@ class ModuleBanRedirect : public Module if(destchan && destchan->IsModeSet(redirectmode) && !destlimit.empty() && (destchan->GetUserCounter() >= ConvToNum<size_t>(destlimit))) { - user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You are banned)"); + user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)"); return MOD_RES_DENY; } else { - user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You are banned)"); - user->WriteNumeric(470, chan->name, redir->targetchan, "You are banned from this channel, so you are automatically transferred to the redirected channel."); + user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)"); + user->WriteNumeric(470, chan->name, redir->targetchan, "You are banned from this channel, so you are automatically being transferred to the redirected channel."); nofollow = true; Channel::JoinUser(user, redir->targetchan); nofollow = false; diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp @@ -60,7 +60,7 @@ class ModuleBlockAmsg : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR); + return Version("Attempt to block /amsg or /ame, at least some of the irritating client scripts", VF_VENDOR); } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE @@ -120,12 +120,12 @@ class ModuleBlockAmsg : public Module { // Block it... if (action == IBLOCK_KILLOPERS || action == IBLOCK_NOTICEOPERS) - ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame denied", user->nick.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s had an /amsg or /ame blocked", user->nick.c_str()); if (action == IBLOCK_KILL || action == IBLOCK_KILLOPERS) ServerInstance->Users->QuitUser(user, "Attempted to global message (/amsg or /ame)"); else if (action == IBLOCK_NOTICE || action == IBLOCK_NOTICEOPERS) - user->WriteNotice("Global message (/amsg or /ame) denied"); + user->WriteNotice("Global message (/amsg or /ame) blocked"); return MOD_RES_DENY; } diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp @@ -392,7 +392,7 @@ public: Version GetVersion() CXX11_OVERRIDE { - return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR); + return Version("Implementation of callerid, provides user mode +g and the ACCEPT command", VF_COMMON | VF_VENDOR); } void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE @@ -422,7 +422,7 @@ public: if (now > (dat->lastnotify + (time_t)notify_cooldown)) { user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them."); - dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.", + dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have user mode +g set. Use /ACCEPT +%s to allow.", user->nick.c_str())); dat->lastnotify = now; } diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp @@ -106,7 +106,7 @@ class CommandCBan : public Command } else { - user->WriteNotice("*** CBan " + parameters[0] + " not found in list, try /stats C."); + user->WriteNotice("*** CBan " + parameters[0] + " not found on the list."); return CMD_FAILURE; } } @@ -204,7 +204,7 @@ class ModuleCBan : public Module, public Stats::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Gives /cban, aka C-lines. Think Q-lines, for channels.", VF_COMMON | VF_VENDOR); + return Version("Provides the CBAN command, like Q-lines, but for channels", VF_COMMON | VF_VENDOR); } }; diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp @@ -62,7 +62,7 @@ class ModuleChanLog : public Module if (itpair.first == itpair.second) return MOD_RES_PASSTHRU; - const std::string snotice = "\2" + desc + "\2: " + msg; + const std::string snotice = "\002" + desc + "\002: " + msg; for (ChanLogTargets::const_iterator it = itpair.first; it != itpair.second; ++it) { @@ -80,7 +80,7 @@ class ModuleChanLog : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Logs snomask output to channel(s).", VF_VENDOR); + return Version("Logs snomask output to channel(s)", VF_VENDOR); } }; diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp @@ -211,7 +211,7 @@ class ModuleClearChan : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Adds /CLEARCHAN that allows opers to masskick, masskill or mass G/Z-line users on a channel.", VF_VENDOR|VF_OPTCOMMON); + return Version("Provides the CLEARCHAN command that allows opers to masskick, masskill or mass G/Z-line users on a channel", VF_VENDOR|VF_OPTCOMMON); } }; diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp @@ -96,7 +96,7 @@ class ModuleClones : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR); + return Version("Provides the CLONES command to retrieve information on clones", VF_VENDOR); } }; diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp @@ -33,7 +33,7 @@ class ModuleConnectBan : public Module public: Version GetVersion() CXX11_OVERRIDE { - return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR); + return Version("Throttles the connections of IP ranges who try to connect flood", VF_VENDOR); } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp @@ -58,7 +58,7 @@ class ModuleCustomPrefix : public Module { ModeHandler* mh = ServerInstance->Modes->FindMode(name, MODETYPE_CHANNEL); if (!mh) - throw ModuleException("<customprefix:change> specified for a non-existent mode at " + tag->getTagLocation()); + throw ModuleException("<customprefix:change> specified for a nonexistent mode at " + tag->getTagLocation()); PrefixMode* pm = mh->IsPrefixMode(); if (!pm) diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp @@ -160,7 +160,7 @@ class ModuleCustomTitle : public Module, public Whois::LineEventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR); + return Version("Custom title for users", VF_OPTCOMMON | VF_VENDOR); } }; diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp @@ -84,7 +84,7 @@ class ModuleCycle : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR); + return Version("Provides the CYCLE command, acts as a server-side HOP command to part and rejoin a channel", VF_VENDOR); } }; diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp @@ -529,7 +529,7 @@ class ModuleDCCAllow : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR); + return Version("Provides support for the DCCALLOW command", VF_COMMON | VF_VENDOR); } }; diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp @@ -34,7 +34,7 @@ class DeafMode : public ModeHandler return MODEACTION_DENY; if (adding) - dest->WriteNotice("*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d."); + dest->WriteNotice("*** You have enabled user mode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode " + dest->nick + " -d."); dest->SetMode(this, adding); return MODEACTION_ALLOW; @@ -57,7 +57,7 @@ class PrivDeafMode : public ModeHandler return MODEACTION_DENY; if (adding) - dest->WriteNotice("*** You have enabled usermode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D."); + dest->WriteNotice("*** You have enabled user mode +D, private deaf mode. This mode means you WILL NOT receive any messages and notices from any nicks. If you did NOT mean to do this, use /mode " + dest->nick + " -D."); dest->SetMode(this, adding); return MODEACTION_ALLOW; @@ -140,7 +140,7 @@ class ModuleDeaf : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides usermodes +dD to block channel and/or user messages and notices", VF_VENDOR); + return Version("Provides user modes +d and +D to block channel and user messages/notices", VF_VENDOR); } }; diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp @@ -127,7 +127,7 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe Version ModuleDelayJoin::GetVersion() { - return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR); + return Version("Allows for delay-join channels (channel mode +D) where users don't appear to join until they speak", VF_VENDOR); } ModResult ModuleDelayJoin::OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp @@ -47,7 +47,7 @@ class DelayMsgMode : public ParamMode<DelayMsgMode, LocalIntExt> class ModuleDelayMsg : public Module - , public CTCTags::EventListener + , public CTCTags::EventListener { private: DelayMsgMode djm; @@ -91,7 +91,7 @@ void DelayMsgMode::OnUnset(User* source, Channel* chan) Version ModuleDelayMsg::GetVersion() { - return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_VENDOR); + return Version("Provides channel mode +d <int>, to deny messages to a channel until <int> seconds have passed", VF_VENDOR); } void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&) @@ -137,7 +137,7 @@ ModResult ModuleDelayMsg::HandleMessage(User* user, const MessageTarget& target, { if (channel->GetPrefixValue(user) < VOICE_VALUE) { - user->WriteNumeric(ERR_CANNOTSENDTOCHAN, channel->name, InspIRCd::Format("You must wait %d seconds after joining to send to channel (+d)", len)); + user->WriteNumeric(ERR_CANNOTSENDTOCHAN, channel->name, InspIRCd::Format("You must wait %d seconds after joining to send to the channel (+d)", len)); return MOD_RES_DENY; } } diff --git a/src/modules/m_disable.cpp b/src/modules/m_disable.cpp @@ -55,7 +55,7 @@ class ModuleDisable : public Module // Check that the mode actually exists. ModeHandler* mh = ServerInstance->Modes->FindMode(chr, type); if (!chr) - throw ModuleException(InspIRCd::Format("Non-existent mode '%c' was specified in <disabled:%s> at %s", + throw ModuleException(InspIRCd::Format("Nonexistent mode '%c' was specified in <disabled:%s> at %s", chr, field.c_str(), tag->getTagLocation().c_str())); // Disable the mode. @@ -89,7 +89,7 @@ class ModuleDisable : public Module // Check that the command actually exists. Command* handler = ServerInstance->Parser.GetHandler(command); if (!handler) - throw ModuleException(InspIRCd::Format("Non-existent command '%s' was specified in <disabled:commands> at %s", + throw ModuleException(InspIRCd::Format("Nonexistent command '%s' was specified in <disabled:commands> at %s", command.c_str(), tag->getTagLocation().c_str())); // Prevent admins from disabling COMMANDS and MODULES for transparency reasons. diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp @@ -116,7 +116,7 @@ class ModuleExemptChanOps : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); + return Version("Provides the ability to allow channel operators to be exempt from certain modes", VF_VENDOR); } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp @@ -226,7 +226,7 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters) } else { - user->WriteNotice("*** Filter '" + parameters[0] + "' not found in list, try /stats s."); + user->WriteNotice("*** Filter '" + parameters[0] + "' not found on the list."); return CMD_FAILURE; } } diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp @@ -169,7 +169,7 @@ class ModuleGlobalLoad : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR); + return Version("Allows global loading of a module", VF_COMMON | VF_VENDOR); } }; diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp @@ -162,7 +162,7 @@ class ModuleHelpop : public Module, public Whois::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the /HELPOP command for useful information", VF_VENDOR); + return Version("Provides the HELPOP command for useful information", VF_VENDOR); } }; diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp @@ -225,7 +225,7 @@ class ModuleHTTPAccessList : public Module, public HTTPACLEventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd dependent modules", VF_VENDOR); + return Version("Provides access control lists (passwording of resources, IP restrictions, etc) to m_httpd dependent modules", VF_VENDOR); } }; diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp @@ -133,7 +133,7 @@ class ModuleKnock : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for /KNOCK and channel mode +K", VF_OPTCOMMON | VF_VENDOR); + return Version("Provides the KNOCK command and channel mode +K", VF_OPTCOMMON | VF_VENDOR); } }; diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp @@ -393,7 +393,7 @@ public: if (user->password.empty()) { if (verbose) - ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (No password provided)", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (no password provided)", user->GetFullRealHost().c_str()); ServerInstance->Users->QuitUser(user, killreason); return MOD_RES_DENY; } @@ -401,7 +401,7 @@ public: if (!LDAP) { if (verbose) - ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (Unable to find LDAP provider)", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteToSnoMask('c', "Forbidden connection from %s (unable to find LDAP provider)", user->GetFullRealHost().c_str()); ServerInstance->Users->QuitUser(user, killreason); return MOD_RES_DENY; } @@ -440,7 +440,7 @@ public: Version GetVersion() CXX11_OVERRIDE { - return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR); + return Version("Allow/deny connections based upon answers from an LDAP server", VF_VENDOR); } }; diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp @@ -41,7 +41,7 @@ class ModuleMapHide : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Replaces the output of /MAP and /LINKS with an URL.", VF_VENDOR); + return Version("Replaces the output of /MAP and /LINKS with an URL", VF_VENDOR); } }; diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp @@ -37,7 +37,7 @@ class ModuleMLock : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR); + return Version("Implements the ability to have server-side MLOCK enforcement", VF_VENDOR); } ModResult OnRawMode(User* source, Channel* channel, ModeHandler* mh, const std::string& parameter, bool adding) CXX11_OVERRIDE @@ -56,7 +56,7 @@ class ModuleMLock : public Module std::string::size_type p = mlock_str->find(mode); if (p != std::string::npos) { - source->WriteNumeric(ERR_MLOCKRESTRICTED, channel->name, mode, *mlock_str, "MODE cannot be set due to channel having an active MLOCK restriction policy"); + source->WriteNumeric(ERR_MLOCKRESTRICTED, channel->name, mode, *mlock_str, "MODE cannot be set due to the channel having an active MLOCK restriction policy"); return MOD_RES_DENY; } diff --git a/src/modules/m_modenotice.cpp b/src/modules/m_modenotice.cpp @@ -65,7 +65,7 @@ class ModuleModeNotice : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the /MODENOTICE command", VF_VENDOR); + return Version("Provides the MODENOTICE command", VF_VENDOR); } }; diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp @@ -129,7 +129,7 @@ class ModuleNamedModes : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR); + return Version("Provides the ability to manipulate modes via long names", VF_VENDOR); } void Prioritize() CXX11_OVERRIDE diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp @@ -43,7 +43,7 @@ class ModuleNamesX Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR); + return Version("Provides the NAMESX (CAP multi-prefix) capability", VF_VENDOR); } void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp @@ -202,7 +202,7 @@ class ModuleNickFlood : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Channel mode F - nick flood protection", VF_VENDOR); + return Version("Provides channel mode +F, nick flood protection", VF_VENDOR); } }; diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp @@ -50,7 +50,7 @@ class ModuleNoKicks : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR); + return Version("Provides channel mode +Q to prevent kicks on the channel", VF_VENDOR); } }; diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp @@ -50,7 +50,7 @@ class ModuleOperChans : public Module { if (chan && chan->IsModeSet(oc) && !user->IsOper()) { - user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only IRC operators may join %s (+O is set)", chan->name.c_str())); + user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str())); return MOD_RES_DENY; } return MOD_RES_PASSTHRU; diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp @@ -27,7 +27,7 @@ class ModuleOperLevels : public Module public: Version GetVersion() CXX11_OVERRIDE { - return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR); + return Version("Gives each oper type a 'level', cannot kill opers 'above' your level", VF_VENDOR); } ModResult OnKill(User* source, User* dest, const std::string &reason) CXX11_OVERRIDE @@ -42,10 +42,10 @@ class ModuleOperLevels : public Module { if (IS_LOCAL(source)) { - ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %lu) attempted to /kill a higher oper: %s (level %lu): Reason: %s", + ServerInstance->SNO->WriteGlobalSno('a', "Oper %s (level %lu) attempted to /KILL a higher level oper: %s (level %lu), reason: %s", source->nick.c_str(), source_level, dest->nick.c_str(), dest_level, reason.c_str()); } - dest->WriteNotice("*** Oper " + source->nick + " attempted to /kill you!"); + dest->WriteNotice("*** Oper " + source->nick + " attempted to /KILL you!"); source->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper %s is a higher level than you", dest->nick.c_str())); return MOD_RES_DENY; } diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp @@ -33,7 +33,7 @@ class ModuleOperLog : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR); + return Version("Provides logging of all oper commands to the ircd log at the default loglevel", VF_VENDOR); } void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp @@ -64,18 +64,18 @@ class CommandOpermotd : public Command if (opermotd.empty()) { if (show_missing) - user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing"); + user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing."); return; } - user->WriteRemoteNumeric(RPL_OMOTDSTART, "- IRC Operators Message of the Day"); + user->WriteRemoteNumeric(RPL_OMOTDSTART, "Server operators message of the day"); for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i) { user->WriteRemoteNumeric(RPL_OMOTD, InspIRCd::Format("- %s", i->c_str())); } - user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "- End of OPERMOTD"); + user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "End of OPERMOTD"); } }; @@ -93,7 +93,7 @@ class ModuleOpermotd : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON); + return Version("Shows a message to opers after oper-up and adds the OPERMOTD command", VF_VENDOR | VF_OPTCOMMON); } void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp @@ -101,7 +101,7 @@ class ModuleOperPrefixMode : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR); + return Version("Gives opers channel mode +y which provides a staff prefix", VF_VENDOR); } void Prioritize() CXX11_OVERRIDE diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp @@ -51,7 +51,7 @@ class ModuleRandQuote : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides random quotes on connect.", VF_VENDOR); + return Version("Provides random quotes on connect", VF_VENDOR); } }; diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp @@ -111,7 +111,7 @@ class ModuleRedirect : public Module } else { - user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirect channel."); + user->WriteNumeric(470, cname, channel, "You may not join this channel, so you are automatically being transferred to the redirected channel."); Channel::JoinUser(user, channel); return MOD_RES_DENY; } diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp @@ -56,7 +56,7 @@ public: Version GetVersion() CXX11_OVERRIDE { - return Version("Regex module using plain wildcard matching.", VF_VENDOR); + return Version("Regex module using plain wildcard matching", VF_VENDOR); } }; diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp @@ -87,13 +87,13 @@ class RemoveBase : public Command if (!channel->HasUser(target)) { - user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str())); + user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str())); return CMD_FAILURE; } if (target->server->IsULine()) { - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a u-line may remove a u-line from a channel."); + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel."); return CMD_FAILURE; } @@ -142,7 +142,7 @@ class RemoveBase : public Command } else { - user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str())); + user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str())); return CMD_FAILURE; } } @@ -222,7 +222,7 @@ class ModuleRemove : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR); + return Version("Provides the REMOVE command as an alternative to KICK, it makes users appear to have left the channel", VF_OPTCOMMON | VF_VENDOR); } }; diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp @@ -24,7 +24,7 @@ class ModuleRestrictMsg : public Module - , public CTCTags::EventListener + , public CTCTags::EventListener { private: ModResult HandleMessage(User* user, const MessageTarget& target) @@ -68,7 +68,7 @@ class ModuleRestrictMsg Version GetVersion() CXX11_OVERRIDE { - return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR); + return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers", VF_VENDOR); } }; diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp @@ -161,7 +161,7 @@ class CommandRLine : public Command } catch (ModuleException &e) { - ServerInstance->SNO->WriteToSnoMask('a',"Could not add RLINE: " + e.GetReason()); + ServerInstance->SNO->WriteToSnoMask('a', "Could not add R-line: " + e.GetReason()); } if (r) @@ -170,11 +170,11 @@ class CommandRLine : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent R-line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added permanent R-line for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); } else { - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s to expire in %s (on %s): %s", + ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s, expires in %s (on %s): %s", user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str()); } @@ -198,7 +198,7 @@ class CommandRLine : public Command } else { - user->WriteNotice("*** R-line " + parameters[0] + " not found in list, try /stats R."); + user->WriteNotice("*** R-line " + parameters[0] + " not found on the list."); } } @@ -246,7 +246,7 @@ class ModuleRLine : public Module, public Stats::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : ""); + return Version("Provides support for banning users through regular expression patterns", VF_COMMON | VF_VENDOR, rxfactory ? rxfactory->name : ""); } ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp @@ -96,7 +96,7 @@ class ModuleSapart : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR); + return Version("Provides the SAPART command to force-part users from a channel", VF_OPTCOMMON | VF_VENDOR); } }; diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp @@ -432,7 +432,7 @@ class ModuleSASL : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR); + return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE", VF_VENDOR); } }; diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp @@ -54,7 +54,7 @@ class Channel_r : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE { - // only a u-lined server may add or remove the +r mode. + // Only a U-lined server may add or remove the +r mode. if (!IS_LOCAL(source)) { // Only change the mode if it's not redundant @@ -312,7 +312,7 @@ class ModuleServicesAccount Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for ircu-style services accounts, including chmode +R, etc.",VF_OPTCOMMON|VF_VENDOR); + return Version("Provides support for ircu-style services accounts, including channel mode +R, etc", VF_OPTCOMMON|VF_VENDOR); } }; diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp @@ -65,7 +65,7 @@ class ModuleServProtectMode : public Module, public Whois::EventListener, public Version GetVersion() CXX11_OVERRIDE { - return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR); + return Version("Provides user mode +k to protect services from kicks, kills, and mode changes", VF_VENDOR); } void OnWhois(Whois::Context& whois) CXX11_OVERRIDE diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp @@ -81,7 +81,7 @@ class CommandShun : public Command } else { - user->WriteNotice("*** Shun " + parameters[0] + " not found in list, try /stats H."); + user->WriteNotice("*** Shun " + parameters[0] + " not found on the list."); return CMD_FAILURE; } } @@ -115,7 +115,7 @@ class CommandShun : public Command } else { - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire in %s (on %s): %s", + ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s, expires in %s (on %s): %s", user->nick.c_str(), target.c_str(), InspIRCd::DurationString(duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), expr.c_str()); } @@ -244,7 +244,7 @@ class ModuleShun : public Module, public Stats::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON); + return Version("Provides the SHUN command, which stops a user from executing all except configured commands", VF_VENDOR|VF_COMMON); } }; diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp @@ -41,7 +41,7 @@ class SilenceEntry // Exclude users who match this flags ("x"). SF_EXEMPT = 1, - + // 2, 4, 8, 16 are reserved for future use. // Matches a NOTICE targeted at a channel ("n"). @@ -369,7 +369,7 @@ class ModuleSilence void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE { - tokens["ESILENCE"] = "CcdiNnPpsTtx"; + tokens["ESILENCE"] = "CcdiNnPpTtx"; tokens["SILENCE"] = ConvToStr(cmd.maxsilence); } diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp @@ -31,7 +31,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params) if (!xlf) { - ServerInstance->SNO->WriteToSnoMask('x',"%s sent me an unknown ADDLINE type (%s).",setter.c_str(),params[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s sent me an unknown ADDLINE type (%s).", setter.c_str(), params[0].c_str()); return CMD_FAILURE; } @@ -42,7 +42,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params) } catch (ModuleException &e) { - ServerInstance->SNO->WriteToSnoMask('x',"Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "Unable to ADDLINE type %s from %s: %s", params[0].c_str(), setter.c_str(), e.GetReason().c_str()); return CMD_FAILURE; } xl->SetCreateTime(ConvToNum<time_t>(params[3])); @@ -50,7 +50,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params) { if (xl->duration) { - ServerInstance->SNO->WriteToSnoMask('X', "%s added %s%s on %s to expire in %s (on %s): %s", + ServerInstance->SNO->WriteToSnoMask('X', "%s added timed %s%s for %s, expires in %s (on %s): %s", setter.c_str(), params[0].c_str(), params[0].length() == 1 ? "-line" : "", params[1].c_str(), InspIRCd::DurationString(xl->duration).c_str(), InspIRCd::TimeString(xl->expiry).c_str(), params[5].c_str()); diff --git a/src/modules/m_spanningtree/ijoin.cpp b/src/modules/m_spanningtree/ijoin.cpp @@ -30,7 +30,7 @@ CmdResult CommandIJoin::HandleRemote(RemoteUser* user, Params& params) { // Desync detected, recover // Ignore the join and send RESYNC, this will result in the remote server sending all channel data to us - ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received IJOIN for non-existant channel: " + params[0]); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received IJOIN for nonexistent channel: " + params[0]); CmdBuilder("RESYNC").push(params[0]).Unicast(user); diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp @@ -103,7 +103,7 @@ struct TreeSocket::BurstState */ void TreeSocket::DoBurst(TreeServer* s) { - ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \2%s\2 (Authentication: %s%s).", + ServerInstance->SNO->WriteToSnoMask('l',"Bursting to \002%s\002 (Authentication: %s%s).", s->GetName().c_str(), capab->auth_fingerprint ? "SSL certificate fingerprint and " : "", capab->auth_challenge ? "challenge-response" : "plaintext password"); @@ -125,7 +125,7 @@ void TreeSocket::DoBurst(TreeServer* s) this->SendXLines(); FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnSyncNetwork, (bs.server)); this->WriteLine(CmdBuilder("ENDBURST")); - ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \2"+ s->GetName()+"\2."); + ServerInstance->SNO->WriteToSnoMask('l',"Finished bursting to \002"+ s->GetName()+"\002."); this->burstsent = true; } diff --git a/src/modules/m_spanningtree/opertype.cpp b/src/modules/m_spanningtree/opertype.cpp @@ -53,7 +53,7 @@ CmdResult CommandOpertype::HandleRemote(RemoteUser* u, CommandBase::Params& para return CMD_SUCCESS; } - ServerInstance->SNO->WriteToSnoMask('O',"From %s: User %s (%s@%s) is now an IRC operator of type %s",u->server->GetName().c_str(), u->nick.c_str(),u->ident.c_str(), u->GetRealHost().c_str(), opertype.c_str()); + ServerInstance->SNO->WriteToSnoMask('O', "From %s: User %s (%s@%s) is now a server operator of type %s", u->server->GetName().c_str(), u->nick.c_str(),u->ident.c_str(), u->GetRealHost().c_str(), opertype.c_str()); return CMD_SUCCESS; } diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp @@ -48,14 +48,14 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, Params& params) if (CheckDupe) { socket->SendError("Server "+servername+" already exists!"); - ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+CheckDupe->GetName()+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, already exists. Closing link with " + ParentOfThis->GetName()); + ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+CheckDupe->GetName()+"\002 being introduced from \002" + ParentOfThis->GetName() + "\002 denied, already exists. Closing link with " + ParentOfThis->GetName()); return CMD_FAILURE; } CheckDupe = Utils->FindServer(sid); if (CheckDupe) { socket->SendError("Server ID "+sid+" already exists! You may want to specify the server ID for the server manually with <server:id> so they do not conflict."); - ServerInstance->SNO->WriteToSnoMask('L', "Server \2"+servername+"\2 being introduced from \2" + ParentOfThis->GetName() + "\2 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName()); + ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+servername+"\002 being introduced from \002" + ParentOfThis->GetName() + "\002 denied, server ID already exists on the network. Closing link with " + ParentOfThis->GetName()); return CMD_FAILURE; } @@ -119,14 +119,14 @@ Link* TreeSocket::AuthRemote(const CommandBase::Params& params) if (!ComparePass(*x, password)) { - ServerInstance->SNO->WriteToSnoMask('l',"Invalid password on link: %s", x->Name.c_str()); + ServerInstance->SNO->WriteToSnoMask('l', "Invalid password on link: %s", x->Name.c_str()); continue; } if (!CheckDuplicate(sname, sid)) return NULL; - ServerInstance->SNO->WriteToSnoMask('l',"Verified server connection " + linkID + " ("+description+")"); + ServerInstance->SNO->WriteToSnoMask('l', "Verified server connection " + linkID + " ("+description+")"); const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(this); if (ssliohook) @@ -139,8 +139,8 @@ Link* TreeSocket::AuthRemote(const CommandBase::Params& params) return x; } - this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. umode +s +Ll)"); - ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, invalid link credentials"); + this->SendError("Mismatched server name or password (check the other server's snomask output for details - e.g. user mode +s +Ll)"); + ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, invalid link credentials"); return NULL; } @@ -177,7 +177,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid { std::string pname = CheckDupe->GetParent() ? CheckDupe->GetParent()->GetName() : "<ourself>"; SendError("Server "+sname+" already exists on server "+pname+"!"); - ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, already exists on server "+pname); + ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, already exists on server "+pname); return false; } @@ -188,7 +188,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid if (CheckDupe) { this->SendError("Server ID "+CheckDupe->GetID()+" already exists on server "+CheckDupe->GetName()+"! You may want to specify the server ID for the server manually with <server:id> so they do not conflict."); - ServerInstance->SNO->WriteToSnoMask('l',"Server connection from \2"+sname+"\2 denied, server ID '"+CheckDupe->GetID()+ + ServerInstance->SNO->WriteToSnoMask('l', "Server connection from \002"+sname+"\002 denied, server ID '"+CheckDupe->GetID()+ "' already exists on server "+CheckDupe->GetName()); return false; } diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp @@ -152,7 +152,7 @@ void TreeServer::FinishBurst() ServerInstance->XLines->ApplyLines(); uint64_t ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000); unsigned long bursttime = ts - this->StartBurst; - ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \2%s\2 (burst time: %lu %s)", + ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \002%s\002 (burst time: %lu %s)", GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs")); StartBurst = 0; diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h @@ -153,7 +153,7 @@ class TreeServer : public Server */ unsigned long rtt; - /** When we recieved BURST from this server, used to calculate total burst time at ENDBURST. + /** When we received BURST from this server, used to calculate total burst time at ENDBURST. */ uint64_t StartBurst; diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp @@ -52,7 +52,7 @@ TreeSocket::TreeSocket(Link* link, Autoconnect* myac, const irc::sockets::sockad if (!irc::sockets::aptosa(link->Bind, 0, bind)) { state = I_ERROR; - SetError("Bind address '" + link->Bind + "' is not an valid IPv4 or IPv6 address"); + SetError("Bind address '" + link->Bind + "' is not a valid IPv4 or IPv6 address"); TreeSocket::OnError(I_ERR_BIND); return; } @@ -143,7 +143,7 @@ void TreeSocket::OnConnected() static_cast<IOHookProvider*>(prov)->OnConnect(this); } - ServerInstance->SNO->WriteGlobalSno('l', "Connection to \2%s\2[%s] started.", linkID.c_str(), + ServerInstance->SNO->WriteGlobalSno('l', "Connection to \002%s\002[%s] started.", linkID.c_str(), (capab->link->HiddenFromStats ? "<hidden>" : capab->link->IPAddr.c_str())); this->SendCapabilities(1); } diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp @@ -161,13 +161,13 @@ void TreeSocket::ProcessLine(std::string &line) time_t delta = them - ServerInstance->Time(); if ((delta < -600) || (delta > 600)) { - ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %ld seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",labs((long)delta)); + ServerInstance->SNO->WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than five minutes). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta)); SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!"); return; } else if ((delta < -30) || (delta > 30)) { - ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %ld seconds. Please consider synching your clocks.", labs((long)delta)); + ServerInstance->SNO->WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta)); } } @@ -417,13 +417,13 @@ void TreeSocket::Close() if (MyRoot) MyRoot->SQuit(getError()); - ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str()); + ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed.", linkID.c_str()); time_t server_uptime = ServerInstance->Time() - this->age; if (server_uptime) { std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime); - ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str()); + ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' was established for %s", linkID.c_str(), timestr.c_str()); } } diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp @@ -86,7 +86,7 @@ class AuthQuery : public SQL::Query } if (verbose) - ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (Password from the SQL query did not match the user provided password)", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (password from the SQL query did not match the user provided password)", user->GetFullRealHost().c_str()); pendingExt.set(user, AUTH_STATE_FAIL); return; } @@ -171,7 +171,7 @@ class ModuleSQLAuth : public Module if (!SQL) { - ServerInstance->SNO->WriteGlobalSno('a', "Forbiding connection from %s (SQL database not present)", user->GetFullRealHost().c_str()); + ServerInstance->SNO->WriteGlobalSno('a', "Forbidden connection from %s (SQL database not present)", user->GetFullRealHost().c_str()); ServerInstance->Users->QuitUser(user, killreason); return MOD_RES_PASSTHRU; } @@ -212,7 +212,7 @@ class ModuleSQLAuth : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Allow/Deny connections based upon an arbitrary SQL table", VF_VENDOR); + return Version("Allow/deny connections based upon an arbitrary SQL table", VF_VENDOR); } }; diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp @@ -110,7 +110,7 @@ class OperQuery : public SQL::Query void OnError(SQL::Error& error) CXX11_OVERRIDE { ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "query failed (%s)", error.ToString()); - ServerInstance->SNO->WriteGlobalSno('a', "m_sqloper: failed to update blocks from database"); + ServerInstance->SNO->WriteGlobalSno('a', "m_sqloper: Failed to update blocks from database"); if (!uid.empty()) { // Fallback. We don't want to block a netadmin from /OPER diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp @@ -159,7 +159,7 @@ class ModuleSSLModes { if (!api) { - user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are a SSL user (+z)"); + user->WriteNumeric(ERR_SECUREONLYCHAN, cname, "Cannot join channel; unable to determine if you are an SSL user (+z)"); return MOD_RES_DENY; } @@ -199,7 +199,7 @@ class ModuleSSLModes { if (!api || !api->GetCertificate(target)) { - user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You must remove usermode 'z' before you are able to send private messages to a non-ssl user."); + user->WriteNumeric(ERR_CANTSENDTOUSER, target->nick, "You must remove user mode 'z' before you are able to send private messages to a non-SSL user."); return MOD_RES_DENY; } } @@ -235,7 +235,7 @@ class ModuleSSLModes Version GetVersion() CXX11_OVERRIDE { - return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices.", VF_VENDOR); + return Version("Provides user and channel mode +z to allow for SSL-only channels, queries and notices", VF_VENDOR); } }; diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp @@ -90,7 +90,7 @@ class ModuleStripColor : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR); + return Version("Provides channel mode +S (strip ansi color)", VF_VENDOR); } }; diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp @@ -121,7 +121,7 @@ class CommandSvshold : public Command } else { - user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found in list, try /stats S."); + user->WriteNotice("*** SVSHOLD " + parameters[0] + " not found on the list."); } } else @@ -223,7 +223,7 @@ class ModuleSVSHold : public Module, public Stats::EventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Implements SVSHOLD. Like Q-lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR); + return Version("Implements SVSHOLD, like Q-lines, but can only be added/removed by Services", VF_COMMON | VF_VENDOR); } }; diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp @@ -79,7 +79,7 @@ class ModuleTLine : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Provides /tline command used to test who a mask matches", VF_VENDOR); + return Version("Provides the TLINE command, used to test how many users a mask matches against", VF_VENDOR); } }; diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp @@ -39,7 +39,7 @@ class ModuleUHNames Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the UHNAMES facility.",VF_VENDOR); + return Version("Provides the UHNAMES facility", VF_VENDOR); } void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp @@ -217,7 +217,7 @@ class ModuleXLineDB : public Module Version GetVersion() CXX11_OVERRIDE { - return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR); + return Version("Provides the ability to store X-lines in a database file", VF_VENDOR); } }; diff --git a/src/users.cpp b/src/users.cpp @@ -368,7 +368,7 @@ void User::Oper(OperInfo* info) if (info->oper_block) opername = info->oper_block->getString("name"); - ServerInstance->SNO->WriteToSnoMask('o',"%s (%s@%s) is now an IRC operator of type %s (using oper '%s')", + ServerInstance->SNO->WriteToSnoMask('o', "%s (%s@%s) is now a server operator of type %s (using oper '%s')", nick.c_str(), ident.c_str(), GetRealHost().c_str(), oper->name.c_str(), opername.c_str()); this->WriteNumeric(RPL_YOUAREOPER, InspIRCd::Format("You are now %s %s", strchr("aeiouAEIOU", oper->name[0]) ? "an" : "a", oper->name.c_str()));