Add Anope::Templace and switch all template strings to use it.

5 files changed, 54 insertions, 54 deletions

diff --git a/data/anope.example.conf b/data/anope.example.conf
index 4474b3175..c21aa343f 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -975,76 +975,76 @@ mail
 	 * The subject and message of emails sent to users when they register accounts.
 	 *
 	 * Available tokens for this template are:
-	 *  %n - Gets replaced with the nickname
-	 *  %N - Gets replaced with the network name
-	 *  %c - Gets replaced with the confirmation code
+	 *  {nick}    - Gets replaced with the nickname
+	 *  {network} - Gets replaced with the network name
+	 *  {code}    - Gets replaced with the confirmation code
 	 */
-	registration_subject = "Nickname registration for %n"
+	registration_subject = "Nickname registration for {nick}"
 	registration_message = "Hi,
 
-				You have requested to register the nickname %n on %N.
-				Please type \" /msg NickServ CONFIRM %c \" to complete registration.
+				You have requested to register the nickname {nick} on {network}.
+				Please type \" /msg NickServ CONFIRM {code} \" to complete registration.
 
 				If you don't know why this mail was sent to you, please ignore it silently.
 
-				%N administrators."
+				{network} administrators."
 
 	/*
 	 * The subject and message of emails sent to users when they request a new password.
 	 *
 	 * Available tokens for this template are:
-	 *  %n - Gets replaced with the nickname
-	 *  %N - Gets replaced with the network name
-	 *  %c - Gets replaced with the confirmation code
+	 *  {nick}    - Gets replaced with the nickname
+	 *  {network} - Gets replaced with the network name
+	 *  {code}    - Gets replaced with the confirmation code
 	 */
-	reset_subject = "Reset password request for %n"
+	reset_subject = "Reset password request for {nick}"
 	reset_message = "Hi,
 
-			You have requested to have the password for %n reset.
-			To reset your password, type \" /msg NickServ CONFIRM %n %c \"
+			You have requested to have the password for {nick} reset.
+			To reset your password, type \" /msg NickServ CONFIRM {nick} {code} \"
 
 			If you don't know why this mail was sent to you, please ignore it silently.
 
-			%N administrators."
+			{network} administrators."
 
 	/*
 	 * The subject and message of emails sent to users when they request a new email address.
 	 *
 	 * Available tokens for this template are:
-	 *  %e - Gets replaced with the old email address
-	 *  %E - Gets replaced with the new email address
-	 *  %n - Gets replaced with the nickname
-	 *  %N - Gets replaced with the network name
-	 *  %c - Gets replaced with the confirmation code
+	 *  {old_email} - Gets replaced with the old email address
+	 *  {new_email} - Gets replaced with the new email address
+	 *  {account}   - Gets replaced with the nickname
+	 *  {network}   - Gets replaced with the network name
+	 *  {code}      - Gets replaced with the confirmation code
 	 */
 	emailchange_subject = "Email confirmation"
 	emailchange_message = "Hi,
 
-			You have requested to change your email address from %e to %E.
-			Please type \" /msg NickServ CONFIRM %c \" to confirm this change.
+			You have requested to change your email address from {old_email} to {new_email}.
+			Please type \" /msg NickServ CONFIRM {code} \" to confirm this change.
 
 			If you don't know why this mail was sent to you, please ignore it silently.
 
-			%N administrators."
+			{network} administrators."
 
 	/*
 	 * The subject and message of emails sent to users when they receive a new memo.
 	 *
 	 * Available tokens for this template are:
-	 *  %n - Gets replaced with the nickname
-	 *  %s - Gets replaced with the sender's nickname
-	 *  %d - Gets replaced with the memo number
-	 *  %t - Gets replaced with the memo text
-	 *  %N - Gets replaced with the network name
+	 *  {receiver}  - Gets replaced with the receiver's nickname
+	 *  {sender}    - Gets replaced with the sender's nickname
+	 *  {number}    - Gets replaced with the memo number
+	 *  {text}      - Gets replaced with the memo text
+	 *  {network}   - Gets replaced with the network name
 	 */
 	memo_subject = "New memo"
-	memo_message = "Hi %n,
+	memo_message = "Hi {receiver},
 
-			You've just received a new memo from %s. This is memo number %d.
+			You've just received a new memo from {sender}. This is memo number {number}.
 
 			Memo text:
 
-			%t"
+			{text}"
 }
 
 /*
diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index b6b4c8938..218e42a1f 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -163,10 +163,10 @@ module
 
 	/*
 	 * The message formatting to use for signed kick messages.
-	 * %n is the nick of the kicker
-	 * %m is the message specified
+	 * {nick} is the nick of the kicker
+	 * {message} is the message specified
 	 */
-	signkickformat = "%m (%n)"
+	signkickformat = "{message} ({nick})"
 
 	/*
 	 * If set, prevents channel access entries from containing hostmasks.
diff --git a/data/modules.example.conf b/data/modules.example.conf
index df03e8519..a242c0a6d 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -119,15 +119,15 @@ module { name = "help" }
 		time = 4h
 
 		/* Reason for akill.
-		 * %n is the nick of the user
-		 * %u is the ident/username of the user
-		 * %g is the realname of the user
-		 * %h is the hostname of the user
-		 * %i is the IP of the user
-		 * %r is the reply reason (configured below). Will be nothing if not configured.
-		 * %N is the network name set in networkinfo:networkname
+		 * {nick} is the nick of the user
+		 * {user} is the ident/username of the user
+		 * {real} is the realname of the user
+		 * {host} is the hostname of the user
+		 * {ip} is the IP of the user
+		 * {reply} is the reply reason (configured below). Will be nothing if not configured.
+		 * {network} is the network name set in networkinfo:networkname
 		 */
-		reason = "You are listed in the EFnet RBL, visit https://rbl.efnetrbl.org/?i=%i for info"
+		reason = "You are listed in the EFnet RBL, visit https://rbl.efnetrbl.org/?i={ip} for info"
 
 		/* Replies to ban and their reason. If no replies are configured, all replies get banned. */
 		reply
@@ -171,7 +171,7 @@ module { name = "help" }
 	{
 		name = "dnsbl.dronebl.org"
 		time = 4h
-		reason = "You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup_branded?ip=%i&network=%N"
+		reason = "You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup?ip={ip}&network={network}"
 	}
 
 	/* Exempt localhost from DNSBL checks */
@@ -270,10 +270,10 @@ module { name = "help" }
 
 	/*
 	 * The search filter used to look up users's accounts.
-	 * %account is replaced with the user's account.
-	 * %object_class is replaced with the object_class configured below.
+	 * {account} is replaced with the user's account.
+	 * {object_class} is replaced with the object_class configured below.
 	 */
-	search_filter = "(&(uid=%account)(objectClass=%object_class))"
+	search_filter = "(&(uid={account})(objectClass={object_class}))"
 
 	/*
 	 * The object class used by LDAP to store user account information.
@@ -327,7 +327,7 @@ module { name = "help" }
 
 	/*
 	 * An optional binddn to use when searching for groups.
-	 * %a is replaced with the account name of the user.
+	 * {account} is replaced with the account name of the user.
 	 */
 	#binddn = "cn=Manager,dc=anope,dc=org"
 
@@ -343,9 +343,9 @@ module { name = "help" }
 
 	/*
 	 * The filter to use when searching for users.
-	 * %a is replaced with the account name of the user.
+	 * {account} is replaced with the account name of the user.
 	 */
-	filter = "(member=uid=%a,ou=users,dc=anope,dc=org)"
+	filter = "(member=uid={account},ou=users,dc=anope,dc=org)"
 
 	/*
 	 * The attribute of the group that is the name of the opertype.
@@ -550,11 +550,11 @@ module
 
 		/*
 		 * The reason to ban the user for.
-		 * %h is replaced with the type of proxy found.
-		 * %i is replaced with the IP of proxy found.
-		 * %p is replaced with the port.
+		 * {type} is replaced with the type of proxy found.
+		 * {ip} is replaced with the IP of proxy found.
+		 * {port} is replaced with the port.
 		 */
-		reason = "You have an open proxy running on your host (%t:%i:%p)"
+		reason = "You have an open proxy running on your host ({type}:{ip}:{port})"
 	}
 }
 
diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf
index 0b99e3daf..8d2896c8c 100644
--- a/data/nickserv.example.conf
+++ b/data/nickserv.example.conf
@@ -93,7 +93,7 @@ module
 	#confirmemailchanges = yes
 
 	/*
-	 * A message sent to users on connect if they use an unregistered nick. %n will be replaced with the user's nickname.
+	 * A message sent to users on connect if they use an unregistered nick. {nick} will be replaced with the user's nickname.
 	 *
 	 * This directive is optional.
 	 */
diff --git a/data/operserv.example.conf b/data/operserv.example.conf
index eb85797f2..f5dc935a6 100644
--- a/data/operserv.example.conf
+++ b/data/operserv.example.conf
@@ -580,7 +580,7 @@ module
 	 *
 	 * This directive is optional, if not set, nothing will be sent.
 	 */
-	sessionlimitexceeded = "The session limit for your IP %IP% has been exceeded."
+	sessionlimitexceeded = "The session limit for your IP {ip} has been exceeded."
 
 	/*
 	 * Same as above, but should be used to provide a website address where users can find out more