From 24f952a70abc6b472401897914eb52f757c44596 Mon Sep 17 00:00:00 2001
From: Moc <github@tijnkuyper.nl>
Date: Sat, 8 Oct 2022 15:33:11 +0200
Subject: [PATCH] Fixes #4801 - Remove whitespace from LAN definition (PM
 plugin)

---
 e107_plugins/pm/languages/English.php     | 18 +++++++++---------
 e107_plugins/pm/pm_class.php              | 12 ++++++------
 e107_plugins/pm/templates/pm_template.php |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/e107_plugins/pm/languages/English.php b/e107_plugins/pm/languages/English.php
index 4ab7a7e73..134227d94 100755
--- a/e107_plugins/pm/languages/English.php
+++ b/e107_plugins/pm/languages/English.php
@@ -74,15 +74,15 @@ define("LAN_PM_70", "Deleting block on user");
 define("LAN_PM_71", "[x] attachment(s) deleted. [y] failure(s)");
 
 
-define("LAN_PM_100", "New PM from ");
-define("LAN_PM_101", "You have received a new Private Message from ");
-define("LAN_PM_102", "Message sent from: ");
-define("LAN_PM_103", "Message subject: ");
-define("LAN_PM_104", "Number of attachments: ");
-define("LAN_PM_105", "You can view the PM at: ");
-define("LAN_PM_106", "PM read by ");
-define("LAN_PM_107", "The Private Message you sent to {UNAME} was read on ");
-define("LAN_PM_108", "Message sent on: ");
+define("LAN_PM_100", "New PM from");
+define("LAN_PM_101", "You have received a new Private Message from");
+define("LAN_PM_102", "Message sent from:");
+define("LAN_PM_103", "Message subject:");
+define("LAN_PM_104", "Number of attachments:");
+define("LAN_PM_105", "You can view the PM at:");
+define("LAN_PM_106", "PM read by");
+define("LAN_PM_107", "The Private Message you sent to {UNAME} was read on");
+define("LAN_PM_108", "Message sent on:");
 define("LAN_PM_109", "New Message(s)");
 define("LAN_PM_111", "Read");
 define("LAN_PM_112", "User(s)");
diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index a4d109bec..0feb3340b 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -402,7 +402,7 @@ class private_message
 
 			$PM_NOTIFY =
 			"<div>
-			<h4>".LAN_PM_101."{SITENAME}</h4>
+			<h4>".LAN_PM_101." {SITENAME}</h4>
 			<table class='table table-striped'>
 			<tr><td>".LAN_PM_102."</td><td>{USERNAME}</td></tr>
 			<tr><td>".LAN_PM_103."</td><td>{PM_SUBJECT}</td></tr>
@@ -430,7 +430,7 @@ class private_message
 		$text = e107::getParser()->simpleParse($PM_NOTIFY, $data);
 
 		$eml = array();
-		$eml['email_subject']		= LAN_PM_100.USERNAME;
+		$eml['email_subject']		= LAN_PM_100." ".USERNAME;
 		$eml['send_html']			= true;
 		$eml['email_body']			= $text;
 		$eml['template']			= 'default';
@@ -457,13 +457,13 @@ class private_message
 	function pm_send_receipt($pmInfo) //TODO Add Template and combine with method above..
 	{
 		require_once(e_HANDLER.'mail.php');
-		$subject = LAN_PM_106.$pmInfo['sent_name'];
+		$subject = LAN_PM_106." ".$pmInfo['sent_name'];
 
 		$pmlink = e107::url('pm','index', null, array('mode'=>'full')).'?show.'.$pmInfo['pm_id'];
 
-		$txt = str_replace("{UNAME}", $pmInfo['sent_name'], LAN_PM_107).date('l F dS Y h:i:s A')."\n\n";
-		$txt .= LAN_PM_108.date('l F dS Y h:i:s A', $pmInfo['pm_sent'])."\n";
-		$txt .= LAN_PM_103.$pmInfo['pm_subject']."\n";
+		$txt = str_replace("{UNAME}", $pmInfo['sent_name'], LAN_PM_107)." ".date('l F dS Y h:i:s A')."\n\n";
+		$txt .= LAN_PM_108." ".date('l F dS Y h:i:s A', $pmInfo['pm_sent'])."\n";
+		$txt .= LAN_PM_103." ".$pmInfo['pm_subject']."\n";
 		$txt .= LAN_PM_105."\n".$pmlink."\n";
 
 		if(sendemail($pmInfo['from_email'], $subject, $txt, $pmInfo['from_name']))
diff --git a/e107_plugins/pm/templates/pm_template.php b/e107_plugins/pm/templates/pm_template.php
index 24c45fa3f..1439c3b67 100644
--- a/e107_plugins/pm/templates/pm_template.php
+++ b/e107_plugins/pm/templates/pm_template.php
@@ -293,7 +293,7 @@ $PM_TEMPLATE['show'] =
 //$PM_NOTIFY =
 $PM_TEMPLATE['notify'] =
 "<div>
-<h4>".LAN_PM_101."{SITENAME}</h4>
+<h4>".LAN_PM_101." {SITENAME}</h4>
 <table class='table table-striped'>
 <tr><td>".LAN_PM_102."</td><td>{USERNAME}</td></tr>
 <tr><td>".LAN_PM_103."</td><td>{PM_SUBJECT}</td></tr>