Browse Source

Updated API, email handling

markseu 2 years ago
parent
commit
9ed2d20723
3 changed files with 17 additions and 14 deletions
  1. 2 2
      system/extensions/core.php
  2. 11 8
      system/extensions/edit.php
  3. 4 4
      system/extensions/update-current.ini

+ 2 - 2
system/extensions/core.php

@@ -2,7 +2,7 @@
 // Core extension, https://github.com/annaesvensson/yellow-core
 
 class YellowCore {
-    const VERSION = "0.8.110";
+    const VERSION = "0.8.111";
     const RELEASE = "0.8.22";
     public $content;        // content files
     public $media;          // media files
@@ -2874,7 +2874,7 @@ class YellowToolbox {
                 if ($blockKey=="Subject") { $subject .= $fragment; continue; }
                 $remaining .= $line."\r\n";
             }
-            $statusCode = sendMail($to, $subject, $message, $remaining) ? 200 : 500;
+            $statusCode = mail($to, $subject, $message, $remaining) ? 200 : 500;
         }
         return $statusCode==200;
     }

+ 11 - 8
system/extensions/edit.php

@@ -2,7 +2,7 @@
 // Edit extension, https://github.com/annaesvensson/yellow-edit
 
 class YellowEdit {
-    const VERSION = "0.8.72";
+    const VERSION = "0.8.73";
     public $yellow;         // access to API
     public $response;       // web response
     public $merge;          // text merge
@@ -1592,17 +1592,20 @@ class YellowEditResponse {
         $message = preg_replace("/@userlanguage/i", $userLanguage, $message);
         $sitename = $this->yellow->system->get("sitename");
         $siteEmail = $this->yellow->system->get("editSiteEmail");
+        $subject = $this->yellow->language->getText("{$prefix}Subject", $userLanguage);
         $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")." <$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";
+        $mailHeaders = array(
+            "To" => "$userName <$userEmail>",
+            "From" => "$sitename <$siteEmail>",
+            "Date" => date(DATE_RFC2822),
+            "Subject" => $subject,
+            "Mime-Version" => "1.0",
+            "Content-Type" => "text/plain; charset=utf-8",
+            "X-Request-Url" => "$scheme://$address$base");
         $mailMessage = "$message\r\n\r\n$url\r\n-- \r\n$footer";
-        return mail($mailTo, $mailSubject, $mailMessage, $mailHeaders);
+        return $this->yellow->toolbox->mail($action, $mailHeaders, $mailMessage);
     }
     
     // Create browser cookies

+ 4 - 4
system/extensions/update-current.ini

@@ -1,11 +1,11 @@
 # Datenstrom Yellow update settings
 
 Extension: Core
-Version: 0.8.110
+Version: 0.8.111
 Description: Core functionality of the website.
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/main/downloads/core.zip
-Published: 2023-05-11 16:39:38
+Published: 2023-05-11 20:47:06
 Developer: Mark Seuffert, David Fehrmann
 Tag: feature
 system/extensions/core.php: core.php, create, update
@@ -17,11 +17,11 @@ system/layouts/navigation.html: navigation.html, create, update, careful
 system/layouts/pagination.html: pagination.html, create, update, careful
 
 Extension: Edit
-Version: 0.8.72
+Version: 0.8.73
 Description: Edit your website in a web browser.
 DocumentationUrl: https://github.com/annaesvensson/yellow-edit
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/main/downloads/edit.zip
-Published: 2023-04-16 23:56:20
+Published: 2023-05-11 17:18:21
 Developer: Anna Svensson
 Tag: feature
 system/extensions/edit.php: edit.php, create, update