Integrate iConf.network in iConf itself as the distinction between

these "network settings" and other settings has been lost in time.

Rename some of these variables and macro's.
ircnetwork -> NETWORK_NAME
ircnet005 -> NETWORK_NAME_005
defserv ->? DEFAULT_SERVER
hidden_host -> CLOAK_PREFIX
helpchan -> HELP_CHANNEL

Also one config change (visible to admins):
set::hiddenhost-prefix is now set::cloak-prefix
We still accept the old name, though.
The example conf has been updated as well, but not the wiki yet.

src/modules/cloak.c

@@ -412,14 +412,14 @@ unsigned int alpha, n;
 	{
 		unsigned int len;
 		p++;
-		ircsnprintf(result, sizeof(result), "%s-%X.", hidden_host, alpha);
+		ircsnprintf(result, sizeof(result), "%s-%X.", CLOAK_PREFIX, alpha);
 		len = strlen(result) + strlen(p);
 		if (len <= HOSTLEN)
 			strlcat(result, p, sizeof(result));
 		else
 			strlcat(result, p + (len - HOSTLEN), sizeof(result));
 	} else
-		ircsnprintf(result, sizeof(result),  "%s-%X", hidden_host, alpha);
+		ircsnprintf(result, sizeof(result),  "%s-%X", CLOAK_PREFIX, alpha);
 
 	return result;
 }

src/modules/help.c

@@ -109,7 +109,7 @@ void parse_help(Client *client, char *name, char *help)
 		SND("   We're sorry, we don't have help available for the command you requested.");
 		SND(" -");
 		sendto_one(client, NULL, ":%s 292 %s : ***** Go to %s if you have any further questions *****",
-		    me.name, client->name, helpchan);
+		    me.name, client->name, HELP_CHANNEL);
 		SND(" -");
 		return;
 	}

src/modules/netinfo.c

@@ -118,11 +118,11 @@ CMD_FUNC(cmd_netinfo)
 	    client->local->traffic.bytes_received,
 	    client->local->traffic.bytes_sent);
 
-	if (!(strcmp(ircnetwork, parv[8]) == 0))
+	if (!(strcmp(NETWORK_NAME, parv[8]) == 0))
 	{
 		sendto_umode_global(UMODE_OPER,
 			"Network name mismatch from link %s (%s != %s)",
-			client->name, parv[8], ircnetwork);
+			client->name, parv[8], NETWORK_NAME);
 	}
 
 	if ((protocol != UnrealProtocol) && (protocol != 0))

src/modules/nick.c

@@ -962,7 +962,7 @@ int _register_user(Client *client, char *nick, char *username, char *umode, char
 		           log_data_string("extended_client_info", get_connect_extinfo(client)));
 
 		RunHook2(HOOKTYPE_WELCOME, client, 0);
-		sendnumeric(client, RPL_WELCOME, ircnetwork, nick, client->user->username, client->user->realhost);
+		sendnumeric(client, RPL_WELCOME, NETWORK_NAME, nick, client->user->username, client->user->realhost);
 
 		RunHook2(HOOKTYPE_WELCOME, client, 1);
 		sendnumeric(client, RPL_YOURHOST, me.name, version);
@@ -1398,7 +1398,7 @@ int AllowClient(Client *client, char *username)
 		else
 		{
 			/* Class is full */
-			sendnumeric(client, RPL_REDIR, aconf->server ? aconf->server : defserv, aconf->port ? aconf->port : 6667);
+			sendnumeric(client, RPL_REDIR, aconf->server ? aconf->server : DEFAULT_SERVER, aconf->port ? aconf->port : 6667);
 			exit_client(client, NULL, iConf.reject_message_server_full);
 			return 0;
 		}

src/modules/server.c

@@ -1483,7 +1483,7 @@ int server_sync(Client *client, ConfigItem_link *aconf, int incoming)
 	sendto_one(client, NULL, "NETINFO %i %lld %i %s 0 0 0 :%s",
 	    irccounts.global_max, (long long)TStime(), UnrealProtocol,
 	    CLOAK_KEYCRC,
-	    ircnetwork);
+	    NETWORK_NAME);
 
 	/* Send EOS (End Of Sync) to the just linked server... */
 	sendto_one(client, NULL, ":%s EOS", me.id);

src/modules/staff.c

@@ -378,7 +378,7 @@ CMD_FUNC(cmd_staff)
 		return;
 	}
 
-	sendto_one(client, NULL, RPL_STAFFSTART, me.name, client->name, ircnetwork);
+	sendto_one(client, NULL, RPL_STAFFSTART, me.name, client->name, NETWORK_NAME);
 
 	temp = &staff;
 

src/modules/stats.c

@@ -504,7 +504,7 @@ int stats_allow(Client *client, char *para)
 				    allows->maxperip,
 				    allows->global_maxperip,
 				    allows->class->name,
-				    allows->server ? allows->server : defserv,
+				    allows->server ? allows->server : DEFAULT_SERVER,
 				    allows->port ? allows->port : 6667);
 		}
 	}
@@ -798,8 +798,8 @@ int stats_set(Client *client, char *para)
 	}
 
 	sendtxtnumeric(client, "*** Configuration Report ***");
-	sendtxtnumeric(client, "network-name: %s", ircnetwork);
-	sendtxtnumeric(client, "default-server: %s", defserv);
+	sendtxtnumeric(client, "network-name: %s", NETWORK_NAME);
+	sendtxtnumeric(client, "default-server: %s", DEFAULT_SERVER);
 	if (SERVICES_NAME)
 	{
 		sendtxtnumeric(client, "services-server: %s", SERVICES_NAME);
@@ -812,8 +812,8 @@ int stats_set(Client *client, char *para)
 	{
 		sendtxtnumeric(client, "sasl-server: %s", SASL_SERVER);
 	}
-	sendtxtnumeric(client, "hiddenhost-prefix: %s", hidden_host);
-	sendtxtnumeric(client, "help-channel: %s", helpchan);
+	sendtxtnumeric(client, "cloak-prefix: %s", CLOAK_PREFIX);
+	sendtxtnumeric(client, "help-channel: %s", HELP_CHANNEL);
 	sendtxtnumeric(client, "cloak-keys: %s", CLOAK_KEYCRC);
 	sendtxtnumeric(client, "kline-address: %s", KLINE_ADDRESS);
 	if (GLINE_ADDRESS)

src/modules/usermodes/bot.c

@@ -70,7 +70,7 @@ MOD_UNLOAD()
 int bot_whois(Client *requester, Client *acptr)
 {
 	if (IsBot(acptr))
-		sendnumeric(requester, RPL_WHOISBOT, acptr->name, ircnetwork);
+		sendnumeric(requester, RPL_WHOISBOT, acptr->name, NETWORK_NAME);
 
 	return 0;
 }