Change some usage of "gecos" to "real name"

Within the example configs, helpops, some server sent messages, and
simple code comments: change the primary usage of "gecos" to
"real name" (or "realname" where fitting).

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index d60e4add70aae44f9381d4f0519611e05e82634b..b5d5813f2d84f0b0695e973335cf04a3321a75d1 100644 (file)
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -145,10 +145,10 @@ everything from people with a host matching *.foo.net, you would do
 
 Sends a notice to a channel indicating you wish to join.">
 
-<helpop key="user" value="/USER <ident> <local host> <remote host> :<GECOS>
+<helpop key="user" value="/USER <ident> <local host> <remote host> :<real name>
 
 This command is used by your client to register your
-IRC session, providing your ident and GECOS to the
+IRC session, providing your ident and real name to the
 server.
 
 You should not use it during an established connection.">
@@ -245,10 +245,10 @@ The following flags after the mask have the following effects:
  i      Show all users who have an ident (username) matching the given mask
  p      Show all users who are connected on the given port number (IRC
         operators only)
- r      Show all users whose realnames match the mask. When this
+ r      Show all users whose real name match the mask. When this
         flag is set it overrides the meaning of the search-pattern,
-        which must contain a glob pattern intended to match GECOS
-        (realname) fields.
+        which must contain a glob pattern intended to match the
+        real name.
  m      Search for all users with a given set of user modes. When
         this flag is set it overrides the meaning of the
         search-pattern, which must contain the mode sequence to
@@ -744,7 +744,7 @@ Sends a message to all +w users.">
 
 <helpop key="rline" value="/RLINE <regex> [<duration> :<reason>]
 
-Sets or removes an r-line (regex line) on a n!u@h\\sgecos mask. You
+Sets or removes an r-line (regex line) on a n!u@h\\srealname mask. You
 must specify all three parameters to add an rline, and one parameter
 to remove an rline (just the regex).
 
@@ -1050,8 +1050,8 @@ Matching extbans:
                wildcards (requires channelban module).
  n:<class>     Matches users in a matching connect class (requires
                classban module).
- r:<realname>  Matches users with a matching realname (requires gecosban
-               module).
+ r:<realname>  Matches users with a matching real name (requires
+               gecosban module).
  s:<server>    Matches users on a matching server (requires serverban
                module).
  z:<certfp>    Matches users with a matching SSL certificate fingerprint

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index cb8b87a777a60e027d6e52c0f80135db8a8f5ffb..0a1705a417af2932c5e2ffd5625701bdc149a464 100644 (file)
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -283,8 +283,8 @@ Matching extbans:
                wildcards (requires channelban module).
  n:<class>     Matches users in a matching connect class (requires
                classban module).
- r:<realname>  Matches users with a matching realname (requires gecosban
-               module).
+ r:<realname>  Matches users with a matching real name (requires
+               gecosban module).
  s:<server>    Matches users on a matching server (requires serverban
                module).
  z:<certfp>    Matches users having the given SSL certificate

diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index fba17b8cca49f874a14b22b25ac15b3a4cf4d5a9..abb8830a96043d3e5e483e7e65c24ac077b997da 100644 (file)
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -794,7 +794,7 @@
         # maxkick: Maximum length of a kick message.
         maxkick="255"
 
-        # maxgecos: Maximum length of a GECOS (realname).
+        # maxgecos: Maximum length of a real name (gecos).
         maxgecos="128"
 
         # maxaway: Maximum length of an away message.

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 84cc8efc7975ac5f0fa2305f157f0d7c1765515e..082db340d33d510f8353948912082a16c807dd2c 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -813,8 +813,8 @@
 #<module name="flashpolicyd">                                         #
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
-# Gecos ban: Implements extended ban 'r', which stops anyone matching
-# a mask like +b r:*realname?here* from joining a channel.
+# Gecos (real name) ban: Implements extended ban 'r', which stops anyone
+# matching a mask like +b r:*realname?here* from joining a channel.
 #<module name="gecosban">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#

diff --git a/src/coremods/core_user/cmd_user.cpp b/src/coremods/core_user/cmd_user.cpp
index c4cdd9b37d94a3adde06004460491194986dd8ae..452146adc5f6eeede173ee11e8238b0755a802a2 100644 (file)
--- a/src/coremods/core_user/cmd_user.cpp
+++ b/src/coremods/core_user/cmd_user.cpp
@@ -32,7 +32,7 @@ CommandUser::CommandUser(Module* parent)
 {
        works_before_reg = true;
        Penalty = 0;
-       syntax = "<username> <localhost> <remotehost> <GECOS>";
+       syntax = "<username> <localhost> <remotehost> <realname>";
 }
 
 CmdResult CommandUser::HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 46894befc7ba11868e637610c411b32ac98d4139..b6c59d36f6dc5ba1e637b0db14c700a6b6175571 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -45,20 +45,20 @@ class CommandChgname : public Command
 
                if (parameters[1].empty())
                {
-                       user->WriteNotice("*** CHGNAME: GECOS must be specified");
+                       user->WriteNotice("*** CHGNAME: Real name must be specified");
                        return CMD_FAILURE;
                }
 
                if (parameters[1].length() > ServerInstance->Config->Limits.MaxGecos)
                {
-                       user->WriteNotice("*** CHGNAME: GECOS too long");
+                       user->WriteNotice("*** CHGNAME: Real name is too long");
                        return CMD_FAILURE;
                }
 
                if (IS_LOCAL(dest))
                {
                        dest->ChangeName(parameters[1]);
-                       ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's GECOS to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "%s used CHGNAME to change %s's real name to '%s'", user->nick.c_str(), dest->nick.c_str(), dest->fullname.c_str());
                }
 
                return CMD_SUCCESS;

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index ab24873ce3225326d37c6ada9a2e578c53875814..ed31cc54a6e61e13ecf294fd2406a696b3bce684 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -43,7 +43,7 @@ class DNSBLConfEntry : public refcountbase
 };
 
 
-/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+/** Resolver for CGI:IRC hostnames encoded in ident/real name
  */
 class DNSBLResolver : public DNS::Request
 {

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index a15f1941844ae04e79a349d7ba54beed1eca7981..9b449da06a05477df15fad97ab525696b882ff43 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -24,7 +24,7 @@ class ModuleGecosBan : public Module
  public:
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Extban 'r' - realname (gecos) ban", VF_OPTCOMMON|VF_VENDOR);
+               return Version("Extban 'r' - real name ban", VF_OPTCOMMON|VF_VENDOR);
        }
 
        ModResult OnCheckBan(User *user, Channel *c, const std::string& mask) CXX11_OVERRIDE

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index bc5d53c946a883c07676bb3779e87fc9b0a6e77f..818c062972c9fed4a448400e5b5efadcf15fed5c 100644 (file)
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -183,8 +183,8 @@ class ModuleHttpStats : public Module, public HTTPRequestEventListener
 
                                        data << "<user>";
                                        data << "<nickname>" << u->nick << "</nickname><uuid>" << u->uuid << "</uuid><realhost>"
-                                               << u->GetRealHost() << "</realhost><displayhost>" << u->GetDisplayedHost() << "</displayhost><gecos>"
-                                               << Sanitize(u->fullname) << "</gecos><server>" << u->server->GetName() << "</server>";
+                                               << u->GetRealHost() << "</realhost><displayhost>" << u->GetDisplayedHost() << "</displayhost><realname>"
+                                               << Sanitize(u->fullname) << "</realname><server>" << u->server->GetName() << "</server>";
                                        if (u->IsAway())
                                                data << "<away>" << Sanitize(u->awaymsg) << "</away><awaytime>" << u->awaytime << "</awaytime>";
                                        if (u->IsOper())

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index 34428e9c04e4bc31cb3b3dfcbe7de89453d84cef..b8efd98aa35b653360e9fe3f235eb218a1ab07d0 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -29,20 +29,20 @@ class CommandSetname : public Command
        CommandSetname(Module* Creator) : Command(Creator,"SETNAME", 1, 1)
        {
                allow_empty_last_param = false;
-               syntax = "<new-gecos>";
+               syntax = "<newname>";
        }
 
        CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
        {
                if (parameters[0].size() > ServerInstance->Config->Limits.MaxGecos)
                {
-                       user->WriteNotice("*** SETNAME: GECOS too long");
+                       user->WriteNotice("*** SETNAME: Real name is too long");
                        return CMD_FAILURE;
                }
 
                if (user->ChangeName(parameters[0]))
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their GECOS to '%s'", user->nick.c_str(), parameters[0].c_str());
+                       ServerInstance->SNO->WriteGlobalSno('a', "%s used SETNAME to change their real name to '%s'", user->nick.c_str(), parameters[0].c_str());
                }
 
                return CMD_SUCCESS;