mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 04:38:27 +01:00
Code Issues Releases Wiki Activity

Fixes #4801 - Remove whitespace from LAN definition (PM plugin)

Browse Source
This commit is contained in:
Moc 2022-10-08 15:33:11 +02:00
parent f2f8877a05
commit 24f952a70a
No known key found for this signature in database
GPG Key ID: AAEA3CC2C5A308F2
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
e107_plugins/pm/languages/English.php
View File

@ -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_71", "[x] attachment(s) deleted. [y] failure(s)");
define("LAN_PM_100", "New PM from "); define("LAN_PM_100", "New PM from");
define("LAN_PM_101", "You have received a new Private Message from "); define("LAN_PM_101", "You have received a new Private Message from");
define("LAN_PM_102", "Message sent from: "); define("LAN_PM_102", "Message sent from:");
define("LAN_PM_103", "Message subject: "); define("LAN_PM_103", "Message subject:");
define("LAN_PM_104", "Number of attachments: "); define("LAN_PM_104", "Number of attachments:");
define("LAN_PM_105", "You can view the PM at: "); define("LAN_PM_105", "You can view the PM at:");
define("LAN_PM_106", "PM read by "); define("LAN_PM_106", "PM read by");
define("LAN_PM_107", "The Private Message you sent to {UNAME} was read on "); define("LAN_PM_107", "The Private Message you sent to {UNAME} was read on");
define("LAN_PM_108", "Message sent on: "); define("LAN_PM_108", "Message sent on:");
define("LAN_PM_109", "New Message(s)"); define("LAN_PM_109", "New Message(s)");
define("LAN_PM_111", "Read"); define("LAN_PM_111", "Read");
define("LAN_PM_112", "User(s)"); define("LAN_PM_112", "User(s)");

12
e107_plugins/pm/pm_class.php
View File

@ -402,7 +402,7 @@ class private_message
$PM_NOTIFY = $PM_NOTIFY =
"<div> "<div>
<h4>".LAN_PM_101."{SITENAME}</h4> <h4>".LAN_PM_101." {SITENAME}</h4>
<table class='table table-striped'> <table class='table table-striped'>
<tr><td>".LAN_PM_102."</td><td>{USERNAME}</td></tr> <tr><td>".LAN_PM_102."</td><td>{USERNAME}</td></tr>
<tr><td>".LAN_PM_103."</td><td>{PM_SUBJECT}</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); $text = e107::getParser()->simpleParse($PM_NOTIFY, $data);
$eml = array(); $eml = array();
$eml['email_subject'] = LAN_PM_100.USERNAME; $eml['email_subject'] = LAN_PM_100." ".USERNAME;
$eml['send_html'] = true; $eml['send_html'] = true;
$eml['email_body'] = $text; $eml['email_body'] = $text;
$eml['template'] = 'default'; $eml['template'] = 'default';
@ -457,13 +457,13 @@ class private_message
function pm_send_receipt($pmInfo) //TODO Add Template and combine with method above.. function pm_send_receipt($pmInfo) //TODO Add Template and combine with method above..
{ {
require_once(e_HANDLER.'mail.php'); 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']; $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 = 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_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_103." ".$pmInfo['pm_subject']."\n";
$txt .= LAN_PM_105."\n".$pmlink."\n"; $txt .= LAN_PM_105."\n".$pmlink."\n";
if(sendemail($pmInfo['from_email'], $subject, $txt, $pmInfo['from_name'])) if(sendemail($pmInfo['from_email'], $subject, $txt, $pmInfo['from_name']))

2
e107_plugins/pm/templates/pm_template.php
View File

@ -293,7 +293,7 @@ $PM_TEMPLATE['show'] =
//$PM_NOTIFY = //$PM_NOTIFY =
$PM_TEMPLATE['notify'] = $PM_TEMPLATE['notify'] =
"<div> "<div>
<h4>".LAN_PM_101."{SITENAME}</h4> <h4>".LAN_PM_101." {SITENAME}</h4>
<table class='table table-striped'> <table class='table table-striped'>
<tr><td>".LAN_PM_102."</td><td>{USERNAME}</td></tr> <tr><td>".LAN_PM_102."</td><td>{USERNAME}</td></tr>
<tr><td>".LAN_PM_103."</td><td>{PM_SUBJECT}</td></tr> <tr><td>".LAN_PM_103."</td><td>{PM_SUBJECT}</td></tr>