mikuli.cz

commit 05d721a82fe31f01851c280630622be23fe3b4a6
parent 9b72c5c35b882b4a0622636e1746b51aea3c366b
Author: markseu <mark2011@mayberg.se>
Date:   Thu,  9 Jan 2020 00:12:39 +0100

Updated edit extension, mail footer

Diffstat:
M
system/extensions/edit.php
 | 
9
++++++---
M
system/extensions/install-languages.zip
 | 
0

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -4,7 +4,7 @@
 // This file may be used and distributed under the terms of the public license.
 
 class YellowEdit {
-    const VERSION = "0.8.16";
+    const VERSION = "0.8.17";
     const TYPE = "feature";
     public $yellow;         //access to API
     public $response;       //web response
@@ -1514,19 +1514,22 @@ class YellowEditResponse {
         }
         $prefix = "edit".ucfirst($action);
         $message = $this->yellow->text->getText("{$prefix}Message", $userLanguage);
-        $message = strreplaceu("\\n", "\n", $message);
+        $message = strreplaceu("\\n", "\r\n", $message);
         $message = preg_replace("/@useraccount/i", $email, $message);
         $message = preg_replace("/@usershort/i", strtok($userName, " "), $message);
         $message = preg_replace("/@username/i", $userName, $message);
         $message = preg_replace("/@userlanguage/i", $userLanguage, $message);
         $sitename = $this->yellow->system->get("sitename");
+        $footer = $this->yellow->text->getText("editMailFooter", $userLanguage);
+        $footer = strreplaceu("\\n", "\r\n", $footer);
+        $footer = preg_replace("/@sitename/i", $sitename, $footer);
         $mailTo = mb_encode_mimeheader("$userName")." <$userEmail>";
         $mailSubject = mb_encode_mimeheader($this->yellow->text->getText("{$prefix}Subject", $userLanguage));
         $mailHeaders = mb_encode_mimeheader("From: $sitename")." <noreply>\r\n";
         $mailHeaders .= mb_encode_mimeheader("X-Request-Url: $scheme://$address$base")."\r\n";
         $mailHeaders .= "Mime-Version: 1.0\r\n";
         $mailHeaders .= "Content-Type: text/plain; charset=utf-8\r\n";
-        $mailMessage = "$message\r\n\r\n$url\r\n-- \r\n$sitename";
+        $mailMessage = "$message\r\n\r\n$url\r\n-- \r\n$footer";
         return mail($mailTo, $mailSubject, $mailMessage, $mailHeaders);
     }
     
diff --git a/system/extensions/install-languages.zip b/system/extensions/install-languages.zip
Binary files differ.