mikuli.cz

commit 3d8b1b68a06ef3c0cc85ad4215713a4cef06812a
parent 24e3901ae3d5a2354f6e09d628d4e2d2312de480
Author: markseu <mark2011@mayberg.se>
Date:   Thu, 19 May 2022 21:17:15 +0200

Updated edit extension, configurable noreply

Co-Authored-By: skrey <3593819+skrey@users.noreply.github.com>

Diffstat:
M
system/extensions/edit.php
 | 
6
++++--
M
system/extensions/update-current.ini
 | 
4
++--

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/system/extensions/edit.php b/system/extensions/edit.php
@@ -2,7 +2,7 @@
 // Edit extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
 
 class YellowEdit {
-    const VERSION = "0.8.61";
+    const VERSION = "0.8.62";
     public $yellow;         // access to API
     public $response;       // web response
     public $merge;          // text merge
@@ -28,6 +28,7 @@ class YellowEdit {
         $this->yellow->system->setDefault("editLoginRestriction", "0");
         $this->yellow->system->setDefault("editLoginSessionTimeout", "2592000");
         $this->yellow->system->setDefault("editBruteForceProtection", "25");
+        $this->yellow->system->setDefault("editSiteEmail", "noreply");
         $this->yellow->language->setDefault("editMailFooter");
     }
     
@@ -1586,12 +1587,13 @@ class YellowEditResponse {
         $message = preg_replace("/@username/i", $userName, $message);
         $message = preg_replace("/@userlanguage/i", $userLanguage, $message);
         $sitename = $this->yellow->system->get("sitename");
+        $siteEmail = $this->yellow->system->get("editSiteEmail");
         $footer = $this->yellow->language->getText("editMailFooter", $userLanguage);
         $footer = str_replace("\\n", "\r\n", $footer);
         $footer = preg_replace("/@sitename/i", $sitename, $footer);
         $mailTo = mb_encode_mimeheader("$userName")." <$userEmail>";
         $mailSubject = mb_encode_mimeheader($this->yellow->language->getText("{$prefix}Subject", $userLanguage));
-        $mailHeaders = mb_encode_mimeheader("From: $sitename")." <noreply>\r\n";
+        $mailHeaders = mb_encode_mimeheader("From: $sitename")." <$siteEmail>\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";
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -37,11 +37,11 @@ system/layouts/navigation.html: navigation.html, create, update, careful
 system/layouts/pagination.html: pagination.html, create, update, careful
 
 Extension: Edit
-Version: 0.8.61
+Version: 0.8.62
 Description: Edit your website in a web browser.
 DocumentationUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/edit
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/edit.zip
-Published: 2022-05-03 12:48:30
+Published: 2022-05-19 20:43:36
 Developer: Datenstrom
 Tag: feature
 system/extensions/edit.php: edit.php, create, update