From 2c8baa8193ca50de4a5fba36031a1042cc65b003 Mon Sep 17 00:00:00 2001
From: Jos Ahrens <buughost@gmail.com>
Date: Fri, 2 Oct 2015 20:23:53 +0200
Subject: [PATCH] ExpandString %network%, alphabeticize ExpandString list

---
 src/IRCNetwork.cpp | 10 ++++++----
 src/User.cpp       | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
index 96d0815f..d1249fa6 100644
--- a/src/IRCNetwork.cpp
+++ b/src/IRCNetwork.cpp
@@ -1434,12 +1434,14 @@ CString CIRCNetwork::ExpandString(const CString& sStr) const {
 
 CString& CIRCNetwork::ExpandString(const CString& sStr, CString& sRet) const {
 	sRet = sStr;
-	sRet.Replace("%defnick%", GetNick());
-	sRet.Replace("%nick%", GetCurNick());
+
 	sRet.Replace("%altnick%", GetAltNick());
-	sRet.Replace("%ident%", GetIdent());
-	sRet.Replace("%realname%", GetRealName());
 	sRet.Replace("%bindhost%", GetBindHost());
+	sRet.Replace("%defnick%", GetNick());
+	sRet.Replace("%ident%", GetIdent());
+	sRet.Replace("%network%", GetName());
+	sRet.Replace("%nick%", GetCurNick());
+	sRet.Replace("%realname%", GetRealName());
 
 	return m_pUser->ExpandString(sRet, sRet);
 }
diff --git a/src/User.cpp b/src/User.cpp
index cc8ab9d0..67bb6b4d 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -543,17 +543,20 @@ CString& CUser::ExpandString(const CString& sStr, CString& sRet) const {
 	CString sTime = CUtils::CTime(time(nullptr), m_sTimezone);
 
 	sRet = sStr;
-	sRet.Replace("%user%", GetUserName());
-	sRet.Replace("%defnick%", GetNick());
-	sRet.Replace("%nick%", GetNick());
 	sRet.Replace("%altnick%", GetAltNick());
-	sRet.Replace("%ident%", GetIdent());
-	sRet.Replace("%realname%", GetRealName());
-	sRet.Replace("%vhost%", GetBindHost());
 	sRet.Replace("%bindhost%", GetBindHost());
-	sRet.Replace("%version%", CZNC::GetVersion());
+	sRet.Replace("%defnick%", GetNick());
+	sRet.Replace("%ident%", GetIdent());
+	sRet.Replace("%nick%", GetNick());
+	sRet.Replace("%realname%", GetRealName());
 	sRet.Replace("%time%", sTime);
 	sRet.Replace("%uptime%", CZNC::Get().GetUptime());
+	sRet.Replace("%user%", GetUserName());
+	sRet.Replace("%version%", CZNC::GetVersion());
+	sRet.Replace("%vhost%", GetBindHost());
+
+	// Allows for escaping ExpandString if necessary, or to prevent
+	// defaults from kicking in if you don't want them.
 	sRet.Replace("%empty%", "");
 	// The following lines do not exist. You must be on DrUgS!
 	sRet.Replace("%znc%", "All your IRC are belong to ZNC");