From 952e29c2f1c3bcb861f53881fa09ca166282c6c1 Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Thu, 31 Aug 2017 21:10:38 +0100
Subject: [PATCH] Email and details working with info_messages.sh

---
 lgsm/functions/alert_email.sh     | 10 ++--
 lgsm/functions/command_details.sh | 92 ++++++++++++++---------------
 lgsm/functions/info_messages.sh   | 98 +++++++++++++++----------------
 3 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh
index 169d4f1dd..b31020d08 100644
--- a/lgsm/functions/alert_email.sh
+++ b/lgsm/functions/alert_email.sh
@@ -143,11 +143,11 @@ if [ -f "${emaillog}" ]; then
 fi
 
 {
-	fn_details_head
-	fn_message_os
-	fn_message_performance
-	fn_message_disk
-	fn_message_gameserver
+	fn_info_message_head
+	fn_info_message_distro
+	fn_info_message_performance
+	fn_info_message_disk
+	fn_info_message_gameserver
 	fn_alert_email_template_logs
 } | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"| tee -a "${emaillog}" > /dev/null 2>&1
 
diff --git a/lgsm/functions/command_details.sh b/lgsm/functions/command_details.sh
index f8f271cf0..3b1787618 100644
--- a/lgsm/functions/command_details.sh
+++ b/lgsm/functions/command_details.sh
@@ -18,98 +18,98 @@ fn_display_details() {
 	info_glibc.sh
 	info_parms.sh
 	info_messages.sh
-	info_message_distro
-	info_message_performance
-	info_message_disk
-	info_message_gameserver
-	info_message_script
-	info_message_backup
+	fn_info_message_distro
+	fn_info_message_performance
+	fn_info_message_disk
+	fn_info_message_gameserver
+	fn_info_message_script
+	fn_info_message_backup
 	# Some game servers do not have parms.
 	if [ "${gamename}" != "TeamSpeak 3" ]&&[ "${engine}" != "avalanche" ]&&[ "${engine}" != "dontstarve" ]&&[ "${engine}" != "projectzomboid" ]&&[ "${engine}" != "renderware" ]; then
 		fn_parms
-		info_message_commandlineparms
+		fn_info_message_commandlineparms
 	fi
-	info_message_ports
+	fn_info_message_ports
 
 	# Display details depending on game or engine.
 	if [ "${engine}" == "avalanche" ]; then
-		info_message_avalanche
+		fn_info_message_avalanche
 	elif [ "${engine}" == "refractor" ]; then
-		info_message_refractor
+		fn_info_message_refractor
 	elif [ "${engine}" == "dontstarve" ]; then
-		info_message_dontstarve
+		fn_info_message_dontstarve
 	elif [ "${engine}" == "goldsource" ]; then
-		info_message_goldsource
+		fn_info_message_goldsource
 	elif [ "${engine}" == "lwjgl2" ]; then
-		info_message_minecraft
+		fn_info_message_minecraft
 	elif [ "${engine}" == "projectzomboid" ]; then
-		info_message_projectzomboid
+		fn_info_message_projectzomboid
 	elif [ "${engine}" == "realvirtuality" ]; then
-		info_message_realvirtuality
+		fn_info_message_realvirtuality
 	elif [ "${engine}" == "seriousengine35" ]; then
-		info_message_seriousengine35
+		fn_info_message_seriousengine35
 	elif [ "${engine}" == "source" ]; then
-		info_message_source
+		fn_info_message_source
 	elif [ "${engine}" == "spark" ]; then
-		info_message_spark
+		fn_info_message_spark
 	elif [ "${engine}" == "starbound" ]; then
-		info_message_starbound
+		fn_info_message_starbound
 	elif [ "${engine}" == "teeworlds" ]; then
-		info_message_teeworlds
+		fn_info_message_teeworlds
 	elif [ "${engine}" == "terraria" ]; then
-		info_message_terraria
+		fn_info_message_terraria
 	elif [ "${engine}" == "unreal" ]||[ "${engine}" == "unreal2" ]; then
-		info_message_unreal
+		fn_info_message_unreal
 	elif [ "${engine}" == "unreal3" ]; then
-		info_message_ut3
+		fn_info_message_ut3
 	elif [ "${gamename}" == "7 Days To Die" ]; then
-		info_message_sdtd
+		fn_info_message_sdtd
 	elif [ "${gamename}" == "ARK: Survival Evolved" ]; then
-		info_message_ark
+		fn_info_message_ark
 	elif [ "${gamename}" == "Ballistic Overkill" ]; then
-		info_message_ballisticoverkill
+		fn_info_message_ballisticoverkill
 	elif [ "${gamename}" == "Call of Duty" ]; then
-		info_message_cod
+		fn_info_message_cod
 	elif [ "${gamename}" == "Call of Duty: United Offensive" ]; then
-		info_message_coduo
+		fn_info_message_coduo
 	elif [ "${gamename}" == "Call of Duty 2" ]; then
-		info_message_cod2
+		fn_info_message_cod2
 	elif [ "${gamename}" == "Call of Duty 4" ]; then
-		info_message_cod4
+		fn_info_message_cod4
 	elif [ "${gamename}" == "Call of Duty: World at War" ]; then
-		info_message_codwaw
+		fn_info_message_codwaw
 	elif [ "${gamename}" == "Factorio" ]; then
-		info_message_factorio
+		fn_info_message_factorio
 	elif [ "${gamename}" == "Hurtworld" ]; then
-		info_message_hurtworld
+		fn_info_message_hurtworld
 	elif [ "${gamename}" == "Project Cars" ]; then
-		info_message_projectcars
+		fn_info_message_projectcars
 	elif [ "${gamename}" == "QuakeWorld" ]; then
-		info_message_quake
+		fn_info_message_quake
 	elif [ "${gamename}" == "Quake 2" ]; then
-		info_message_quake2
+		fn_info_message_quake2
 	elif [ "${gamename}" == "Quake 3: Arena" ]; then
-		info_message_quake3
+		fn_info_message_quake3
 	elif [ "${gamename}" == "Quake Live" ]; then
-		info_message_quakelive
+		fn_info_message_quakelive
 	elif [ "${gamename}" == "Squad" ]; then
-		info_message_squad
+		fn_info_message_squad
 	elif [ "${gamename}" == "TeamSpeak 3" ]; then
-		info_message_teamspeak3
+		fn_info_message_teamspeak3
 	elif [ "${gamename}" == "Tower Unite" ]; then
-		info_message_towerunite
+		fn_info_message_towerunite
 	elif [ "${gamename}" == "Multi Theft Auto" ]; then
-		info_message_mta
+		fn_info_message_mta
 	elif [ "${gamename}" == "Mumble" ]; then
-		info_message_mumble
+		fn_info_message_mumble
 	elif [ "${gamename}" == "Rust" ]; then
-		info_message_rust
+		fn_info_message_rust
 	elif [ "${gamename}" == "Wolfenstein: Enemy Territory" ]; then
-		info_message_wolfensteinenemyterritory
+		fn_info_message_wolfensteinenemyterritory
 	else
 		fn_print_error_nl "Unable to detect server engine."
 	fi
-	info_message_statusbottom
+	fn_info_message_statusbottom
 }
 
 if [ -z "${postdetails}" ] ;
diff --git a/lgsm/functions/info_messages.sh b/lgsm/functions/info_messages.sh
index c2db257bf..5512e3b26 100644
--- a/lgsm/functions/info_messages.sh
+++ b/lgsm/functions/info_messages.sh
@@ -7,10 +7,10 @@
 # Standard Details
 # This applies to all engines
 
-info_message_head(){
+fn_info_message_head(){
 	echo -e ""
-	echo -e "Summary"
-	echo -e "================================="
+	echo -e "${lightyellow}Summary${default}"
+	fn_messages_separator
 	echo -e "Message"
 	echo -e "${alertbody}"
 	echo -e ""
@@ -30,7 +30,7 @@ info_message_head(){
 	echo -e "${alerturl}"
 }
 
-info_message_distro(){
+fn_info_message_distro(){
 	#
 	# Distro Details
 	# =====================================
@@ -54,7 +54,7 @@ info_message_distro(){
 	} | column -s $'\t' -t
 }
 
-info_message_performance(){
+fn_info_message_performance(){
 	#
 	# Performance
 	# =====================================
@@ -80,7 +80,7 @@ info_message_performance(){
 	} | column -s $'\t' -t
 }
 
-info_message_disk(){
+fn_info_message_disk(){
 	#
 	# Storage
 	# =====================================
@@ -108,7 +108,7 @@ info_message_disk(){
 	} | column -s $'\t' -t
 }
 
-info_message_gameserver(){
+fn_info_message_gameserver(){
 	#
 	# Quake Live Server Details
 	# =====================================
@@ -241,7 +241,7 @@ info_message_gameserver(){
 	echo -e ""
 }
 
-info_message_script(){
+fn_info_message_script(){
 	#
 	# qlserver Script Details
 	# =====================================
@@ -316,7 +316,7 @@ info_message_script(){
 	} | column -s $'\t' -t
 }
 
-info_message_backup(){
+fn_info_message_backup(){
 	#
 	# Backups
 	# =====================================
@@ -348,7 +348,7 @@ info_message_backup(){
 	fi
 }
 
-info_message_commandlineparms(){
+fn_info_message_commandlineparms(){
 	#
 	# Command-line Parameters
 	# =====================================
@@ -360,7 +360,7 @@ info_message_commandlineparms(){
 	echo -e "${executable} ${parms}"
 }
 
-info_message_ports(){
+fn_info_message_ports(){
 	# Ports
 	# =====================================
 	# Change ports by editing the parameters in:
@@ -393,7 +393,7 @@ info_message_ports(){
 	echo -e "Useful port diagnostic command:"
 }
 
-info_message_statusbottom(){
+fn_info_message_statusbottom(){
 	echo -e ""
 	if [ "${status}" == "0" ]; then
 		echo -e "${blue}Status:\t${red}OFFLINE${default}"
@@ -405,7 +405,7 @@ info_message_statusbottom(){
 
 # Engine/Game Specific details
 
-info_message_ark(){
+fn_info_message_ark(){
 	echo -e "netstat -atunp | grep ShooterGame"
 	echo -e ""
 	{
@@ -420,7 +420,7 @@ info_message_ark(){
 	} | column -s $'\t' -t
 }
 
-info_message_ballisticoverkill(){
+fn_info_message_ballisticoverkill(){
 	echo -e "netstat -atunp | grep BODS.x86"
 	echo -e ""
 	{
@@ -430,7 +430,7 @@ info_message_ballisticoverkill(){
 	} | column -s $'\t' -t
 }
 
-info_message_avalanche(){
+fn_info_message_avalanche(){
 	echo -e "netstat -atunp | grep Jcmp-Server"
 	echo -e ""
 	{
@@ -439,7 +439,7 @@ info_message_avalanche(){
 	} | column -s $'\t' -t
 }
 
-info_message_cod(){
+fn_info_message_cod(){
 	echo -e "netstat -atunp | grep cod_lnxded"
 	echo -e ""
 	{
@@ -448,7 +448,7 @@ info_message_cod(){
 	} | column -s $'\t' -t
 }
 
-info_message_coduo(){
+fn_info_message_coduo(){
 	echo -e "netstat -atunp | grep coduo_lnxded"
 	echo -e ""
 	{
@@ -457,7 +457,7 @@ info_message_coduo(){
 	} | column -s $'\t' -t
 }
 
-info_message_cod2(){
+fn_info_message_cod2(){
 	echo -e "netstat -atunp | grep cod2_lnxded"
 	echo -e ""
 	{
@@ -466,7 +466,7 @@ info_message_cod2(){
 	} | column -s $'\t' -t
 }
 
-info_message_cod4(){
+fn_info_message_cod4(){
 	echo -e "netstat -atunp"
 	echo -e ""
 	{
@@ -475,7 +475,7 @@ info_message_cod4(){
 	} | column -s $'\t' -t
 }
 
-info_message_codwaw(){
+fn_info_message_codwaw(){
 	echo -e "netstat -atunp | grep codwaw_lnxded"
 	echo -e ""
 	{
@@ -484,7 +484,7 @@ info_message_codwaw(){
 	} | column -s $'\t' -t
 }
 
-info_message_dontstarve(){
+fn_info_message_dontstarve(){
 	echo -e "netstat -atunp | grep dontstarve"
 	echo -e ""
 	{
@@ -496,7 +496,7 @@ info_message_dontstarve(){
 	} | column -s $'\t' -t
 }
 
-info_message_factorio(){
+fn_info_message_factorio(){
 	echo -e "netstat -atunp | grep factorio"
 	echo -e ""
 	{
@@ -505,7 +505,7 @@ info_message_factorio(){
 	} | column -s $'\t' -t
 }
 
-info_message_goldsource(){
+fn_info_message_goldsource(){
 	echo -e "netstat -atunp | grep hlds_linux"
 	echo -e ""
 	{
@@ -515,7 +515,7 @@ info_message_goldsource(){
 	} | column -s $'\t' -t
 }
 
-info_message_hurtworld(){
+fn_info_message_hurtworld(){
 	echo -e "netstat -atunp | grep Hurtworld"
 	echo -e ""
 	{
@@ -525,7 +525,7 @@ info_message_hurtworld(){
 	} | column -s $'\t' -t
 }
 
-info_message_minecraft(){
+fn_info_message_minecraft(){
 	echo -e "netstat -atunp | grep java"
 	echo -e ""
 	{
@@ -534,7 +534,7 @@ info_message_minecraft(){
 	} | column -s $'\t' -t
 }
 
-info_message_mumble(){
+fn_info_message_mumble(){
 	echo -e "netstat -atunp | grep murmur"
 	echo -e ""
 	{
@@ -544,7 +544,7 @@ info_message_mumble(){
 	} | column -s $'\t' -t
 }
 
-info_message_projectcars(){
+fn_info_message_projectcars(){
 	echo -e "netstat -atunp | grep DedicatedS"
 	echo -e ""
 	{
@@ -555,7 +555,7 @@ info_message_projectcars(){
 	} | column -s $'\t' -t
 }
 
-info_message_projectzomboid(){
+fn_info_message_projectzomboid(){
 	echo -e "netstat -atunp | grep java"
 	echo -e ""
 	{
@@ -564,7 +564,7 @@ info_message_projectzomboid(){
 	} | column -s $'\t' -t
 }
 
-info_message_quake(){
+fn_info_message_quake(){
 	echo -e "netstat -atunp | grep mvdsv"
 	echo -e ""
 	{
@@ -573,7 +573,7 @@ info_message_quake(){
 	} | column -s $'\t' -t
 }
 
-info_message_quake2(){
+fn_info_message_quake2(){
 	echo -e "netstat -atunp | grep quake2"
 	echo -e ""
 	{
@@ -582,7 +582,7 @@ info_message_quake2(){
 	} | column -s $'\t' -t
 }
 
-info_message_quake3(){
+fn_info_message_quake3(){
 	echo -e "netstat -atunp | grep q3ded"
 	echo -e ""
 	{
@@ -591,7 +591,7 @@ info_message_quake3(){
 	} | column -s $'\t' -t
 }
 
-info_message_quakelive(){
+fn_info_message_quakelive(){
 	echo -e "netstat -atunp | grep qzeroded"
 	echo -e ""
 	if [ -z "${port}" ]||[ -z "${rconport}" ]||[ -z "${statsport}" ]; then
@@ -606,7 +606,7 @@ info_message_quakelive(){
 	} | column -s $'\t' -t
 }
 
-info_message_realvirtuality(){
+fn_info_message_realvirtuality(){
 	echo -e "netstat -atunp | grep arma3server"
 	echo -e ""
 	# Default port
@@ -625,7 +625,7 @@ info_message_realvirtuality(){
 	} | column -s $'\t' -t
 }
 
-info_message_refractor(){
+fn_info_message_refractor(){
 	echo -e "netstat -atunp | grep bf1942_lnxd"
 	echo -e ""
 	{
@@ -635,7 +635,7 @@ info_message_refractor(){
 	} | column -s $'\t' -t
 }
 
-info_message_rust(){
+fn_info_message_rust(){
 	echo -e "netstat -atunp | grep Rust"
 	echo -e ""
 	{
@@ -645,7 +645,7 @@ info_message_rust(){
 	} | column -s $'\t' -t
 }
 
-info_message_seriousengine35(){
+fn_info_message_seriousengine35(){
 	echo -e "netstat -atunp | grep Sam3_Dedicate"
 	echo -e ""
 	{
@@ -655,7 +655,7 @@ info_message_seriousengine35(){
 	} | column -s $'\t' -t
 }
 
-info_message_sdtd(){
+fn_info_message_sdtd(){
 	echo -e "netstat -atunp | grep 7DaysToDie"
 	echo -e ""
 	{
@@ -683,7 +683,7 @@ info_message_sdtd(){
 	} | column -s $'\t' -t
 }
 
-info_message_source(){
+fn_info_message_source(){
 	echo -e "netstat -atunp | grep srcds_linux"
 	echo -e ""
 	{
@@ -694,7 +694,7 @@ info_message_source(){
 	} | column -s $'\t' -t
 }
 
-info_message_spark(){
+fn_info_message_spark(){
 	echo -e "netstat -atunp | grep server_linux3"
 	echo -e ""
 	{
@@ -713,7 +713,7 @@ info_message_spark(){
 	} | column -s $'\t' -t
 }
 
-info_message_squad(){
+fn_info_message_squad(){
 	echo -e "netstat -atunp | grep SquadServer"
 	echo -e ""
 	{
@@ -724,7 +724,7 @@ info_message_squad(){
 	} | column -s $'\t' -t
 }
 
-info_message_starbound(){
+fn_info_message_starbound(){
 	echo -e "netstat -atunp | grep starbound"
 	echo -e ""
 	{
@@ -735,7 +735,7 @@ info_message_starbound(){
 	} | column -s $'\t' -t
 }
 
-info_message_teamspeak3(){
+fn_info_message_teamspeak3(){
 	echo -e "netstat -atunp | grep ts3server"
 	echo -e ""
 	{
@@ -746,7 +746,7 @@ info_message_teamspeak3(){
 	} | column -s $'\t' -t
 }
 
-info_message_teeworlds(){
+fn_info_message_teeworlds(){
 	echo -e "netstat -atunp | grep teeworlds_srv"
 	echo -e ""
 	{
@@ -755,7 +755,7 @@ info_message_teeworlds(){
 	} | column -s $'\t' -t
 }
 
-info_message_terraria(){
+fn_info_message_terraria(){
 	echo -e "netstat -atunp | grep TerrariaServer"
 	echo -e ""
 	{
@@ -764,7 +764,7 @@ info_message_terraria(){
 	} | column -s $'\t' -t
 }
 
-info_message_towerunite(){
+fn_info_message_towerunite(){
 	echo -e "netstat -atunp | grep TowerServer"
 	echo -e ""
 	{
@@ -778,7 +778,7 @@ info_message_towerunite(){
 	} | column -s $'\t' -t
 }
 
-info_message_unreal(){
+fn_info_message_unreal(){
 	echo -e "netstat -atunp | grep ucc-bin"
 	echo -e ""
 	{
@@ -816,7 +816,7 @@ info_message_unreal(){
 	} | column -s $'\t' -t
 }
 
-info_message_ut3(){
+fn_info_message_ut3(){
 	echo -e "netstat -atunp | grep ut3-bin"
 	echo -e ""
 	{
@@ -825,7 +825,7 @@ info_message_ut3(){
 	} | column -s $'\t' -t
 }
 
-info_message_wolfensteinenemyterritory(){
+fn_info_message_wolfensteinenemyterritory(){
 	echo -e "netstat -atunp | grep etded"
 	echo -e ""
 	{
@@ -834,7 +834,7 @@ info_message_wolfensteinenemyterritory(){
 	} | column -s $'\t' -t
 }
 
-info_message_mta(){
+fn_info_message_mta(){
 	echo -e "netstat -atunp | grep mta-server64"
 	echo -e ""
 	{