v2.17 - Several bugfixes - PHP8 confirmed testing - Preparations for release 3

Fix config.json.template

README.md

@@ -1,27 +1,39 @@
-## Minor bugfixes to the code (2021/10/06)
-Code improvements to prevent possible errors leading into a non-functional mailGraph ... (typical error within log or Zabbix: "json error").
+## Introduction ##
+Over the years I've been using Zabbix as both personal and business solution for monitoring. One of the missing features in Zabbix itself was the ability to have graphs generated and associated to monitoring messages as well as an easy way to jump back into Zabbix when searching for monitoring information for specific events, problems or to have a direct link to the associated Zabbix item or host.
 
-Please inform me (raise an issue) in case you have PHP related errors in your logs - this should no longer be the case with v1.31.
+This initiated the development of mailGraph v1 in Zabbix 5.4 delivering an elementary solution for sending HTML enriched messages from Zabbix including graphs.
+To facilitate in a very flexible way to setup and format messages including the graphs, Twig made its introduction towards mailGraph v2, the current release branch of mailGraph.
 
-## mailGraph (v1.31)
-Zabbix Media module and scripts for sending e-mail alerts with graphs.
+The below message is just an example of what MailGraph is capable of. The template engine in Twig allows for a fully customized message creation to your needs! It is also possible to add more Zabbix fields as any field is passed to Twig when accessible in Zabbix through the macro mechanism.
 
-**Please use the Wiki for information on how to install, configure and use MailGraph in Zabbix**
+Note that all Zabbix host, item or screen related information is made available to Twig automatically.
 
-## UPGRADE NOTES
-### v1.31
-Updated: mailGraph.pgp - Bugfixes and c
+Example message:
 
-### v1.29
-Updated: mailGraph.php
+![Example image](https://github.com/moudsen/mailGraph/assets/16045332/0cb671d9-464f-493b-b250-15dd550fd84a)
 
-### v1.27
-If you upgrade to v1.27 please be aware of the additional features for adding Tags to Trigger and Host to add additional graphs and the associated `html.template` updates that come alone with it (otherwise the new graphs will not show ...).
+mailGraph is capable of adding several series of graphs into a single message delivering a unique experience when and how groups of graph images per the requested periods of time are added.
+Currently mailGraph supports hosts, (one or more related) items and screens (applicable to Zabbix 5.4 only).
 
-### v1.25 and higher
-Template data provisioning and code has fundamentally changed. If you upgrade from an earlier version as v1.25, make sure you understand the changes in templates/html.template (now making use of arrays for lists of items).
+More information can be found in the Wiki.
 
-## Example message
-The below message is just an example of what MailGraph is capable of. The template engine used ("Twig") allows for a fully customized message creation to your needs!
+## Installation ##
+Please refer to the Wiki how to get mailGraph installed and configured on your system.
 
-[![](images/Example-mail-message-v122.png?raw=true)](images/Example-mail-message-v122.png)
+## Announcement - Zabbix 5.x maintenance for mailGraph end-of-life - mailGraph 3.x development in progress ##
+_(2023/11/01)_
+
+As per November 2023 the maintenance on mailGraph v2.x for Zabbix 5.x will stop in conjunction with the Zabbix lifecycle policy (https://www.zabbix.com/life_cycle_and_release_policy) as Zabbix 5 is nearing it's end of life.
+
+In conjunction mailGraph v2.x is now frozen and I'm setting up a roadmap for mailGraph v3.x starting new development in Alfa mode as November 2023. This new code is not expected to be published until start of 2024.
+
+Principal bug fixing on mailGraph v2.x (logic failure or similar) will continue but only for Zabbix 6.x onwards.
+
+I'm open to new feature requests - please raise an issue for this in this Github space.
+
+## Special thank you ##
+I would like to express my gratitude to the following people that have actively contributed to bring bugs and improvements to my attention:
+- [pqvindesland](https://github.com/pqvindesland)
+
+## IMPORTANT NOTE for users of mailGraph v2 and older and Zabbix versions under 6.0 ##
+As per November 2023, mailGraph is no longer maintained for Zabbix 5 and older.

config/config.json.template

@@ -1,7 +1,5 @@
 {
     "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
     "cli_duration": 0,
     "cli_recipient": "recipient@mydomain.com",
@@ -15,14 +13,19 @@
     "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@mydomain.com",
     "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
     "smtp_server": "localhost",
     "smtp_port": 25,
     "smtp_transport": "none",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
     "smtp_strict": "yes",
     "graph_match": "any",
     "period": "20m",
     "period_header": "Last 20 minutes",
+    "retention_images": 7,
+    "retention_logs": 14,
     "debug": 0
 }

config/config.json.template.multigraph

@@ -1,7 +1,5 @@
 {
     "script_baseurl": "https:\/\/mydomain.com\/",
-    "cli_itemId": 0,
-    "cli_triggerId": 0,
     "cli_eventId": 0,
     "cli_duration": 0,
     "cli_recipient": "recipient@mydomain.com",
@@ -15,11 +13,14 @@
     "zabbix_user_pwd": "astrongpassword",
     "zabbix_api_user": "alogicalusername",
     "zabbix_api_pwd": "astrongpassword",
-    "mail_from": "sender@mydomain.com",
     "subject": "{{ HOST_NAME|raw }}:  ({{ EVENT_SEVERITY }}) {{ EVENT_NAME|raw }}",
     "smtp_server": "localhost",
     "smtp_port": 25,
     "smtp_transport": "none",
+    "smtp_from_address": "mailgraph@mydomain.com",
+    "smtp_from_name": "mailGraph",
+    "smtp_reply_address": "feedback@mydomain.com",
+    "smtp_reply_name": "mailGraph response mailbox",
     "smtp_strict": "yes",
     "graph_match": "any",
     "periods": "10m,4h,2d,7d",

javascript/READ.ME

@@ -0,0 +1 @@
+Issue #32 has been resolved. The javascript code now works for Zabbix 5.4, 6.0 LTS and 6.4.

javascript/zabbix.mailGraph.js

@@ -1,7 +1,19 @@
+// mailGraph v2.16
+
+// Function to test string
+function isJSON(str) {
+	try {
+		JSON.stringify(JSON.parse(str));
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
 try {
     // Pickup parameters
     params = JSON.parse(value),
-        req = new CurlHttpRequest(),
+        req = new HttpRequest(),
         fields = {},
         resp = '',
         result = { tags: {} };
@@ -13,14 +25,18 @@ try {
     }
 
     // Declare output type
-    req.AddHeader('Content-Type: application/json');
+    req.addHeader('Content-Type: application/json');
 
-    // Must have fields
-    fields.itemId = params.itemId;
-    fields.eventId = params.eventId;
+    // Pick up fields relevant for mailGraph API level call while parsing/casting fields that should be integer
+    fields.itemId = params.itemId * 1;
+    fields.eventId = params.eventId * 1;
     fields.recipient = params.recipient;
     fields.baseURL = params.baseURL;
-    fields.duration = params.duration;
+    fields.duration = params.duration * 1;
+
+    if (fields.recipient.charAt(0) == '{') {
+      throw '[MailGraph Webhook] Please define recipient for the test message!';
+    }
 
     // Optional fields
     if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }
@@ -40,22 +56,44 @@ try {
 
     // Post information to the processing script
     Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));
-    var resp = req.Post(params.URL,JSON.stringify(fields));
-    Zabbix.Log(4, '[Mailgraph Webhook] Receiving response:' + resp);
+    var resp = req.post(params.URL,JSON.stringify(fields));
+    Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
 
-    // If there was an error, report it
-    if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }
+    // The response can be
+    // - did not receive status 200 as result (contains HTTP server response)
+    // - null (no response received at all)
+    // - empty string (likely no e-mail sent due to recipient issue)
+    // - not json (debugging message for troubleshooting or configuration hints)
+    // - json (contains the mail message ID sent)
 
-    // We expect the message id back from the processing script
-    resp = JSON.parse(resp);
-    result.tags.__message_id = resp.messageId;
+    if (req.getStatus() != 200) {
+       throw '[MailGraph Webhook] Processing of mailGraph.php failed: ' + resp;
+    }
+    if (resp==null) {
+      throw '[MailGraph Webhook] No response received from mailGraph.php? This should not occur (check URL and your webserver!)';
+    }
+
+    if (resp=='') {
+      throw '[MailGraph Webhook] No data received from mailGraph - please check recipient address or mailGraph log and retry.';
+    }
+
+    // Check if JSON was returned
+    if (!isJSON(resp)) {
+      throw '[MailGraph Webhook] An error has occurred during processing: ' + resp;
+    }
+
+    // We expect the message id back from the processing script response in JSON format
+    msg = JSON.parse(resp);
+
+    result.tags.__message_id = msg.messageId;
+    Zabbix.Log(4, '[MailGraph Webhook] Message sent with identification "' + msg.messageId + '"');
 
     // Pass the result back to Zabbix
     return JSON.stringify(result);
 }
 catch (error)
 {
-    // In case something went wrong in the processing, pass the error back to Zabbix
-    Zabbix.Log(127, 'MailGraph notification failed : '+error);
+    // In case something else went wrong in the processing, pass the error back to Zabbix
+    Zabbix.Log(127, 'MailGraph notification failed: '+error);
     throw 'MailGraph notification failed : '+error;
 }

mailGraph.php

@@ -8,40 +8,37 @@
     // upon an alert message.
     //
     // ------------------------------------------------------------------------------------------------------
-    // 1.00 2021/02/26 - Mark Oudsen - MVP version, ready for distribution
-    // 1.01 2021/02/27 - Mark Oudsen - Enhanced search for associated graphs to an item // bug fixes
-    // 1.10 2021/02/27 - Mark Oudsen - Moved all configuration outside code
-    // 1.11 2021/02/28 - Mark Oudsen - Bugfixes
-    // 1.12 2021/03/01 - Mark Oudsen - Bugfixes
-    //                                 Adding mail server configuration via config.json
-    // 1.13 2021/03/01 - Mark Oudsen - Added smtp options to encrypt none,ssl,tls
-    // 1.14 2021/03/01 - Mark Oudsen - Added smtp strict certificates yes|no via config.json
-    // 1.15 2021/03/01 - Mark Oudsen - Revised relevant graph locator; allowing other item graphs if current
-    //                                 item does not have a graph associated
-    // 1.16 2021/03/02 - Mark Oudsen - Found issue with graph.get not returning graphs to requested item ids
-    //                                 Workaround programmed (fetch host graphs, search for certain itemids)
-    // 1.17 2021/03/02 - Mark Oudsen - Added ability to specify period of time displayed in the graph
-    // 1.18 2021/03/04 - Mark Oudsen - Added ability to specify Tags per trigger
-    //                                 Shorten long "lastvalue" or "prevvalue"
-    // 1.19 2021/03/05 - Mark Oudsen - Added ability to pass Zabbix 'infoXXX' parameters for TWIG template
-    // 1.20 2021/03/07 - Mark Oudsen - Production level version - leaving BETA from here on ...
-    // 1.21 2021/03/09 - Mark Oudsen - Reverted graph.get code back to original code as it was not a bug but
-    //                                 a wrongly typed requested (should be ARRAY, not comma separated)!
-    // 1.22 2021/03/10 - Mark Oudsen - Added ability to embed multiple periods (1-4) of the same graph
-    // 1.23 2021/03/12 - Mark Oudsen - Added graph support for 'Stacked', 'Pie' and 'Exploded'
-    // 1.24 2021/03/12 - Mark Oudsen - Added support for HTTP proxy
-    // 1.25 2021/03/16 - Mark Oudsen - Refactoring for optimized flow and relevant data retrieval
-    // 1.26 2021/03/19 - Mark Oudsen - Bugfixes after refactor (wrong itemId and incorrect eventValue)
-    //                                 Suppressing Zabbix username-password in log
-    // 1.27 2021/03/19 - Mark Oudsen - Added ability to define "mailGraph.screen" tag to embed graphs from
-    //                                 Added PHP informational and warnings to log for easier debug/spotting
-    // 1.28 2021/03/24 - Mark Oudsen - Added ability to specify username/password for TLS/SSL
-    // 1.29 2021/04/03 - Mark Oudsen - Bugfix due to stricter JSONRPC version check since Zabbix 5.0.10
-    //      2021/07/05 - Mark Oudsen - Minor detail added: CLI debug mode now also outputs version
-    //      2021/07/07 - Mark Oudsen - Fixed HTTPProxy typo in code (instead of HTTPPRoxy)
-    //      2021/07/07 - Mark Oudsen - #20 - Added problem URL as ready to use TWIG macro
-    // 1.30 2021/07/07 - Mark Oudsen - Adding auto-cleaning of images, log retention and some more macros
-    // 1.31 2021/10/06 - Mark Oudsen - Bugfixes, PHP error suppression and prevention of trivial errors
+    // Release 1 tested with Zabbix 5.4 and 6.0 LTS (history available on GitHub)
+    // ------------------------------------------------------------------------------------------------------
+    // Release 2 tested with Zabbix 5.4, 6.0 LTS and 6.4 - tested with latest Composer libraries
+    // ------------------------------------------------------------------------------------------------------
+    // 2.00 2021/12/16 - Mark Oudsen - itemId not always provisioned by Zabbix
+    //                                 Several fixes on warning - several small bug fixes
+    // 2.01 2021/12/16 - Mark Oudsen - Screens are no longer available - reverting to using Dashboards now
+    // 2.02 2022/01/30 - Mark Oudsen - Added cleanup routine for old logs and images
+    // 2.10 2023/06/30 - Mark Oudsen - Refactored deprecated code - now compatible with Zabbix 6.0 LTS, 6.4
+    // 2.11 2023/07/01 - Mark Oudsen - Refactored Zabbix javascript - now capturing obvious errors
+    //                                 Added ability to locate latest problems for testing purposes
+    // 2.12 2023/07/02 - Mark Oudsen - Replaced SwiftMailer with PHPMailer (based on AutoTLS)
+    // 2.13 2023/07/03 - Mark Oudsen - Bugfixes speciifally on links into Zabbix (missing context or info)
+    // 2.14 2023/07/10 - Mark Oudsen - Adding ability to set 'From'  and 'ReplyTo' addresses in configuration
+    //                                 Adding ACK_URL for utilization in the template to point to Ack page
+    //                                 Small refactor on itemId variable processing (no longer mandatory)
+    //                                 Additional logic added to random eventId to explain in case of issues
+    //                                 Fixed missing flag for fetching web url related items
+    // 2.15 2023/08/16 - Mark Oudsen - Bugfix for Zabbix 5.4 where empty or zeroed variables are no longer
+    //                                 passed by Zabbix (hence resulting in weird errors)
+    // 2.16 2023/08/16 - Mark Oudsen - Adding ability to use ACKNOWLEDGE messages in the mail message
+    // 2.17 2024/12/30 - Mark Oudsen - Fixed #47 mailData initializaton (wrong location) - BernardLinz
+    //                                 Fixed #46 invalid GraphId on trigger tag - BernardLinz
+    //                                 Fixed #44 config.json.template wrong var name - WMP
+    //                                 Fixed #45 handling of international characters - Dima-online
+    //                                 Tested with latest PHPMailer (6.9.3) and TWIG (3.11.3), PHP 7.4
+    //                                 Tested with PHP 8.3, TWIG (3.18.0)
+    // ------------------------------------------------------------------------------------------------------
+    // Release 3 placeholder for Zabbix 7.0 LTS and 7.2
+    // ------------------------------------------------------------------------------------------------------
+    // v2.17                           Testing on Zabbix 7.0 LTS (in progress), Zabbix 7.2 (in progress)
     // ------------------------------------------------------------------------------------------------------
     //
     // (C) M.J.Oudsen, mark.oudsen@puzzl.nl
@@ -50,46 +47,79 @@
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Notes
+    // -----
+    // 1) mailGraph is following the environmental requirements from Zabbix, supporting PHP 7.4-8.3 ad per
+    //    - https://www.zabbix.com/documentation/6.0/en/manual/installation/requirements
+    //    - https://www.zabbix.com/documentation/6.4/en/manual/installation/requirements
+    //
+    // 2) TWIG 3.18.0 is available on PHP 8 only (seemless upgrade when using composer update)
+    //
+    // 3) Testing of composer libraries updates is limited to every 6 to 12 months
+    //    - In case you encounter an issue, please raise an issue on GitHub
+    //      https://github.com/moudsen/mailGraph/issues
+    //      
+    //
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    //
+    // Roadmap
+    // -------
+    // - Automatic setup and configuration of mailGraph
+    // - Automatic code updates (CLI triggered)
+    // - Add DASHBOARD facility (SCREEN was abandoned in Zabbix 5.4
+    // - Extract Graph API functionality to seperate code unit/object
+    //
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     //
     // MAIN SEQUENCE
     // -------------
     // 1) Fetch trigger, item, host, graph, event information via Zabbix API via CURL
-    // 2) Fetch Graph(s) associated to the item/trigger (if any) via Zabbix URL login via CURL
-    // 3) Build and send mail message from template using Swift/TWIG
-    // 4) Cleanup images, retention logs
+    // 2) Fetch Graph(s) associated to the item/trigger (if any) via Zabbix URL via CURL
+    // 3) Build and send mail message from template using PHPmailer//TWIG
     //
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     // CONSTANTS
-
-    $cVersion = 'v1.31';
+    $cVersion = 'v2.17';
     $cCRLF = chr(10).chr(13);
     $maskDateTime = 'Y-m-d H:i:s';
-    $maxGraphs = 4;
+    $maxGraphs = 8;
 
     // DEBUG SETTINGS
     // -- Should be FALSE for production level use
 
-    $cDebug = FALSE;          // Extended debug logging mode
+    $cDebug = TRUE;           // Extended debug logging mode, switch to FALSE for production environment
     $cDebugMail = FALSE;      // If TRUE, includes log in the mail message (html and plain text attachments)
     $showLog = FALSE;         // Display the log - !!! only use in combination with CLI mode !!!
 
-    // Limit server level output errors; this will ensure no error messages are passed to Zabbix which
-    // otherwise will block mailGraph from functioning correctly
+    // Limit server level output errors
 
     error_reporting(E_ERROR | E_PARSE);
 
     // INCLUDE REQUIRED LIBRARIES (Composer)
     // (configure at same location as the script is running or load in your own central library)
-    // -- swiftmailer/swiftmailer       https://swiftmailer.symfony.com/docs/introduction.html
+    // -- phpmailer/phpmailer           https://github.com/PHPMailer/PHPMailer
     // -- twig/twig                     https://twig.symfony.com/doc/3.x/templates.html
 
     // Change only required if you decide to use a local/central library, otherwise leave as is
     include(getcwd().'/vendor/autoload.php');
 
+    use PHPMailer\PHPMailer\PHPMailer;
+    use PHPMailer\PHPMailer\SMTP;
+    use PHPMailer\PHPMailer\Exception;
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Fetch the HTML source of the given URL
@@ -252,8 +282,12 @@
 
         curl_close($ch);
 
-        // Delete cookie
-        unlink($filename_cookie);
+        // Delete cookie (if exists)
+        if (file_exists($filename_cookie))
+        {
+            unlink($filename_cookie);
+            _log('- Removed cookie '.$filename_cookie);
+        }
 
         // Write file
         $fp = fopen($image_name, 'w');
@@ -391,6 +425,78 @@
         return($info);
     }
 
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Cleanup 'path': remove files with 'ext' older than 'daysOld'
+
+    function cleanupDir($path, $ext, $daysOld)
+    {
+        _log('- Scanning "'.$path.'"');
+
+        $files = glob($path.'/*'.$ext);
+        $now = time();
+
+        $filesRemoved = 0;
+        $filesKept = 0;
+
+        foreach ($files as $file)
+        {
+            if (is_file($file))
+            {
+                if ($now - filemtime($file) >= (60 * 60 * 24 * $daysOld))
+                {
+                    _log('> Removing "'.$file.'"');
+                    unlink($file);
+                    $filesRemoved++;
+                }
+                else
+                {
+                    $filesKept++;
+                }
+            }
+        }
+
+        _log(': Done. Cleaned up '.$filesRemoved.' file(s), kept '.$filesKept.' file(s)');
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Zabbix translator functions
+
+    function zabbixTStoString($linuxTime)
+    {
+        return date("Y-m-d H:i:s", $linuxTime);
+    }
+
+    function zabbixActionToString($actionMask)
+    {
+        $values = [];
+
+        if ($actionMask & 1) { $values[] = "Close problem"; }
+        if ($actionMask & 2) { $values[] = "Acknowledge event"; }
+        if ($actionMask & 4) { $values[] = "Add message"; }
+        if ($actionMask & 8) { $values[] = "Change severity"; }
+        if ($actionMask & 16) { $values[] = "Unacknowledge event"; }
+        if ($actionMask & 32) { $values[] = "Suppress event"; }
+        if ($actionMask & 64) { $values[] = "Unsuppress event"; }
+        if ($actionMask & 128) { $values[] = "Change event rank to cause"; }
+        if ($actionMask & 256) { $values[] = "Change event rank to sympton"; }
+
+        return implode(", ", $values);
+    }
+
+    function zabbixSeverityToString($severity)
+    {
+        switch ($severity) {
+            case 0: return('Not classified');
+            case 1: return('Information');
+            case 2: return('Warning');
+            case 3: return('Average');
+            case 4: return('High');
+            case 5: return('Disaster');
+        }
+    }
+
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Initialize ///////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -403,6 +509,10 @@
     _log('# Configuration taken from config.json'.$cCRLF.
          json_encode(maskOutputFields($config),JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
 
+    // --- MAIL DATA ---
+
+    $mailData = array();
+
     // --- POST DATA ---
 
     // Read POST data
@@ -424,16 +534,19 @@
             _log('<<< mailGraph '.$cVersion.' >>>');
             _log('# Invoked from CLI');
 
-            // Assumes that config.json file has the correct information
+            // Assumes that config.json file has the correct information for MANDATORY information
+
+            // DEFAULTS
+            $problemData['eventId'] = 0;
+            $problemData['duration'] = 0;
 
             // MANDATORY
-            $problemData['itemId'] = $config['cli_itemId'];
-            $problemData['eventId'] = $config['cli_eventId'];
             $problemData['recipient'] = $config['cli_recipient'];
             $problemData['baseURL'] = $config['cli_baseURL'];
-            $problemData['duration'] = $config['cli_duration'];
 
             // OPTIONAL
+            if (isset($config['cli_eventId'])) { $problemData['eventId'] = $config['cli_eventId']; }
+            if (isset($config['cli_duration'])) { $problemData['duration'] = $config['cli_duration']; }
             if (isset($config['cli_subject'])) { $problemData['subject'] = $config['cli_subject']; }
             if (isset($config['cli_period'])) { $problemData['period'] = $config['cli_period']; }
             if (isset($config['cli_period_header'])) { $problemData['period_header'] = $config['cli_period_header']; }
@@ -441,6 +554,35 @@
             if (isset($config['cli_periods_headers'])) { $problemData['periods_headers'] = $config['cli_periods_headers']; }
             if (isset($config['cli_debug'])) { $problemData['debug'] = $config['cli_debug']; }
             if (isset($config['cli_proxy'])) { $problemData['HTTPProxy'] = $config['cli_proxy']; }
+
+            // BACKWARDS COMPATIBILITY - obsolete from Zabbix 6.2 onwards
+            $problemData['itemId'] = 0;
+            if (isset($config['cli_itemId'])) { $problemData['itemId'] = $config['cli_itemId']; }
+        }
+
+        if (($argc>1) && ($argv[1]=='cleanup'))
+        {
+            // Switch on CLI log display
+            $showLog = TRUE;
+
+            // Check for configuration of retention period for images and logs
+            _log('<<< mailGraph '.$cVersion.' >>>');
+            _log('# Invoked from CLI');
+
+            // Set defaults
+            $retImages = 30;
+            $retLogs = 14;
+
+            // Check if configured settings
+            if (isset($config['retention_images'])) { $retImages = intval($config['retention_images']); }
+            if (isset($config['retention_logs'])) { $retLogs = intval($config['retention_logs']); }
+
+            _log('Cleaning up IMAGES ('.$retImages.' days) and LOGS ('.$retLogs.' days)');
+
+            cleanupDir(getcwd().'/images', '.png', $retImages);
+            cleanupDir(getcwd().'/log', '.dump', $retLogs);
+
+            exit(0);
         }
     }
 
@@ -448,10 +590,8 @@
          $cCRLF.json_encode($problemData,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
 
     // --- CHECK AND SET P_ VARIABLES ---
-    // FROM POST OR CLI DATA
 
-    if (!isset($problemData['itemId'])) { echo "Missing ITEM ID?\n"; die; }
-    $p_itemId = intval($problemData['itemId']);
+    // FROM POST OR CLI DATA
 
     if (!isset($problemData['eventId'])) { echo "Missing EVENT ID?\n"; die; }
     $p_eventId = intval($problemData['eventId']);
@@ -459,8 +599,8 @@
     if (!isset($problemData['recipient'])) { echo "Missing RECIPIENT?\n"; die; }
     $p_recipient = $problemData['recipient'];
 
-    if (!isset($problemData['duration'])) { echo "Missing DURATION?\n"; die; }
-    $p_duration = intval($problemData['duration']);
+    $p_duration = 0;
+    if (isset($problemData['duration'])) { $p_duration = intval($problemData['duration']); }
 
     if (!isset($problemData['baseURL'])) { echo "Missing URL?\n"; die; }
     $p_URL = $problemData['baseURL'];
@@ -497,10 +637,6 @@
     $p_smtp_port = 25;
     if (isset($config['smtp_port'])) { $p_smtp_port = $config['smtp_port']; }
 
-    $p_smtp_transport = 'none';
-    if ((isset($config['smtp_transport'])) && ($config['smtp_transport']=='tls')) { $p_smtp_transport = 'tls'; }
-    if ((isset($config['smtp_transport'])) && ($config['smtp_transport']=='ssl')) { $p_smtp_transport = 'ssl'; }
-
     $p_smtp_strict = 'yes';
     if ((isset($config['smtp_strict'])) && ($config['smtp_strict']=='no')) { $p_smtp_strict = 'no'; }
 
@@ -510,39 +646,81 @@
     $p_smtp_password = '';
     if (isset($config['smtp_password'])) { $p_smtp_password = $config['smtp_password']; }
 
+    $p_smtp_from_address = '';
+    if (isset($config['smtp_from_address'])) { $p_smtp_from_address = $config['smtp_from_address']; }
+
+    $p_smtp_from_name = 'mailGraph';
+    if (isset($config['smtp_from_name'])) { $p_smtp_from_name = $config['smtp_from_name']; }
+
+    $p_smtp_reply_address = '';
+    if (isset($config['smtp_reply_address'])) { $p_smtp_reply_address = $config['smtp_reply_address']; }
+
+    $p_smtp_reply_name = 'mailGraph feedback';
+    if (isset($config['smtp_reply_name'])) { $p_smtp_reply_name = $config['smtp_reply_name']; }
+
+    // >>> Backwards compatibility but smtp_from_address is leading (<v2.14)
+    $mailFrom = '';
+    if (isset($config['mail_from'])) { $mailFrom = $config['mail_from']; }
+
+    if (($p_smtp_from_address=='') && ($mailFrom!=''))
+    {
+        $p_smtp_from_address = $mailFrom;
+    }
+
     $p_graph_match = 'any';
     if ((isset($config['graph_match'])) && ($config['graph_match']=='exact')) { $p_graph_match = 'exact'; }
 
-    $p_remove_images = 'yes';
-    if ((isset($config['remove_images'])) && ($config['remove_images']=='no')) { $p_remove_images = 'no'; }
-
-    $p_log_retention = 365;
-    if (isset($config['log_retention'])) { $p_log_retention =intval($config['log_retention']); }
-
     // --- GLOBAL CONFIGURATION ---
 
     // Script related settings
     $z_url = $config['script_baseurl'];             // Script URL location (for relative paths to images, templates, log, tmp)
-    $z_url_image = $z_url.'images/';                // Images URL (included in plain message as text)
+    $z_url_image = $z_url.'images/';                // Images URL (included in plain message text)
 
-    // Absolute paths for processing
+    // Absolute path where to store the generated images - note: script does not take care of clearing out old images!
     $z_path = getcwd().'/';                         // Absolute base path on the filesystem for this url
-    $z_images_path = $z_path.'images/';             // Storing images here
-    $z_template_path = $z_path.'templates/';        // Expecting templates here
-    $z_tmp_cookies = $z_path.'tmp/';                // Temporary path required for Cookies (front-end login to Zabbix for image generation)
-    $z_log_path = $z_path.'log/';                   // Where logs are stored of mailGraph
+    $z_images_path = $z_path.'images/';
+    $z_template_path = $z_path.'templates/';
+    $z_tmp_cookies = $z_path.'tmp/';
+    $z_log_path = $z_path.'log/';
+
+    // If tmp, log, or images does not exist, create them
+    if (!is_dir($z_tmp_cookies))
+    {
+        mkdir($z_tmp_cookies);
+        _log('+ created TMP directory "'.$z_tmp_cookies.'"');
+    }
+
+    if (!is_dir($z_log_path))
+    {
+        mkdir($z_log_path);
+        _log('+ created LOG directory "'.$z_log_path.'"');
+    }
+
+    if (!is_dir($z_images_path))
+    {
+        mkdir($z_images_path);
+        _log('+ created IMAGES directory "'.$z_images_path.'"');
+    }
 
     // Zabbix user (requires Super Admin access rights to access image generator script)
     $z_user = $config['zabbix_user'];
     $z_pass = $config['zabbix_user_pwd'];
 
     // Zabbix API user (requires Super Admin access rights)
+    // --- Copy from Zabbix user and override when defined in configuration
     // TODO: Check if information retreival can be done with less rigths
-    $z_api_user = $config['zabbix_api_user'];
-    $z_api_pass = $config['zabbix_api_pwd'];
+    $z_api_user = $z_user;
+    $z_api_pass = $z_pass;
 
-    // Mail sender
-    $mailFrom = array($config['mail_from']=>'Zabbix Mailgraph');
+    if (isset($config['zabbix_api_user']))
+    {
+        $z_api_user = $config['zabbix_api_user'];
+    }
+
+    if (isset($config['zabbix_api_pwd']))
+    {
+        $z_api_pass = $config['zabbix_api_pwd'];
+    }
 
     // Derived variables - do not change!
     $z_server = $p_URL;                             // Zabbix server URL from config
@@ -552,9 +730,9 @@
     // Check accessibility of paths and template files //////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    if (!is_writable($z_images_path)) { echo 'Image path inaccessible (should have read/write rights)?'.$cCRLF; die; }
-    if (!is_writable($z_tmp_cookies)) { echo 'Cookies temporary path inaccessible (should have read/write rights)?'.$cCRLF; die; }
-    if (!is_writable($z_log_path)) { echo 'Log path inaccessible (should have read/write rights)?'.$cCRLF; die; }
+    if (!is_writable($z_images_path)) { echo 'Image path inaccessible?'.$cCRLF; die; }
+    if (!is_writable($z_tmp_cookies)) { echo 'Cookies temporary path inaccessible?'.$cCRLF; die; }
+    if (!is_writable($z_log_path)) { echo 'Log path inaccessible?'.$cCRLF; die; }
     if (!file_exists($z_template_path.'html.template')) { echo 'HTML template missing?'.$cCRLF; die; }
     if (!file_exists($z_template_path.'plain.template')) { echo 'PLAIN template missing?'.$cCRLF; die; }
 
@@ -562,8 +740,6 @@
     // Fetch information via API ////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    $mailData = array();
-
     $mailData['BASE_URL'] = $p_URL;
     $mailData['SUBJECT'] = $p_subject;
 
@@ -575,7 +751,7 @@
 
     $request = array('jsonrpc'=>'2.0',
                      'method'=>'user.login',
-                     'params'=>array('user'=>$z_api_user,
+                     'params'=>array('username'=>$z_api_user,
                                      'password'=>$z_api_pass),
                      'id'=>nextRequestID(),
                      'auth'=>null);
@@ -587,7 +763,7 @@
 
     if ($token=='')
     {
-        echo 'Error logging in to Zabbix (check username/password)? ('.$z_url_api.'): '.$cCRLF;
+        echo 'Error logging in to Zabbix? ('.$z_url_api.'): '.$cCRLF;
         echo var_dump($request).$cCRLF;
         echo var_dump($result).$cCRLF;
         die;
@@ -595,6 +771,68 @@
 
     _log('> Token = '.$token);
 
+    // -----------------------
+    // --- LOG API VERSION ---
+    // -----------------------
+
+    _log('# Record Zabbix API version');
+
+    $request = array('jsonrpc'=>'2.0',
+                     'method'=>'apiinfo.version',
+                     'params'=>[],
+                     'id'=>nextRequestID());
+
+    $result = postJSON($z_url_api, $request);
+
+    $apiVersion = $result['result'];
+
+    _log('> API version '.$apiVersion);
+
+    // -----------------------------------
+    // --- IF NO EVENT ID FETCH LATEST ---
+    // -----------------------------------
+
+    if ($p_eventId=="0")
+    {
+        _log('# No event ID given, picking up random event from Zabbix');
+
+        $request = array('jsonrpc'=>'2.0',
+                         'method'=>'problem.get',
+                         'params'=>array('output'=>'extend',
+                                         'recent'=>'true',
+                                         'limit'=>1),
+                         'auth'=>$token,
+                         'id'=>nextRequestID());
+
+        $thisProblems = postJSON($z_url_api, $request);
+        _log('> Problem data (recent)'.$cCRLF.json_encode($thisProblems,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+
+        if (!isset($thisProblems['result'][0]))
+        {
+            _log('- No response data received. Retrying with less recent problems ... ');
+
+            $request = array('jsonrpc'=>'2.0',
+                             'method'=>'problem.get',
+                             'params'=>array('output'=>'extend',
+                                             'recent'=>'false',
+                                             'limit'=>1),
+                             'auth'=>$token,
+                             'id'=>nextRequestID());
+
+            $thisProblems = postJSON($z_url_api, $request);
+            _log('> Problem data (not recent)'.$cCRLF.json_encode($thisProblems,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+
+            if (!isset($thisProblems['result'][0]))
+            {
+                _log('! Cannot continue: mailGraph is unable to pick a random event via the Zabbix API. It is highly likely that no active problems exist? Please retry or determine and set an event ID manually and retry.');
+                die;
+            }
+        }
+
+        $p_eventId = $thisProblems['result'][0]['eventid'];
+        _log('> Picked up random last event #'.$p_eventId);
+    }
+
     // ------------------------------
     // --- READ EVENT INFORMATION ---
     // ------------------------------
@@ -606,7 +844,8 @@
                      'params'=>array('eventids'=>$p_eventId,
                                      'output'=>'extend',
                                      'selectRelatedObject'=>'extend',
-                                     'selectSuppressionData'=>'extend'),
+                                     'selectSuppressionData'=>'extend',
+                                     'select_acknowledges'=>'extend'),
                      'auth'=>$token,
                      'id'=>nextRequestID());
 
@@ -635,6 +874,17 @@
                 break;
     }
 
+    // --- Collect and attach acknowledge messages for this event
+    if (sizeof($thisEvent['result'][0]['acknowledges']>0)) {
+        foreach($thisEvent['result'][0]['acknowledges'] as $aCount=>$anAck) {
+            $mailData['ACKNOWLEDGES'][$aCount] = $anAck;
+            $mailData['ACKNOWLEDGES'][$aCount]['_clock'] = zabbixTStoString($anAck['clock']);
+            $mailData['ACKNOWLEDGES'][$aCount]['_actions'] = zabbixActionToString($anAck['action']);
+            $mailData['ACKNOWLEDGES'][$aCount]['_old_severity'] = zabbixSeverityToString($anAck['old_severity']);
+            $mailData['ACKNOWLEDGES'][$aCount]['_new_severity'] = zabbixSeverityToString($anAck['new_severity']);
+        }
+    }
+
     $p_triggerId = $thisEvent['result'][0]['relatedObject']['triggerid'];
 
     // ------------------------
@@ -648,10 +898,10 @@
                      'params'=>array('triggerids'=>$p_triggerId,
                                      'output'=>'extend',
                                      'selectFunctions'=>'extend',
-                                     'selectTags'=>'extend'),
-                     'expandComment'=>1,
-                     'expandDescription'=>1,
-                     'expandExpression'=>1,
+                                     'selectTags'=>'extend',
+                                     'expandComment'=>1,
+                                     'expandDescription'=>1,
+                                     'expandExpression'=>1),
                      'auth'=>$token,
                      'id'=>nextRequestID());
 
@@ -737,6 +987,17 @@
         }
     }
 
+    // If no specific itemId is requested take the first item found on the items list from the host
+    if (!isset($p_itemId))
+    {
+        foreach($thisTrigger['result'][0]['functions'] as $aFunction)
+        {
+            $p_itemId = $aFunction['itemid'];
+            _log('- Item ID taken from trigger (first) function = '.$p_itemId);
+            break;
+        }
+    }
+
     // ---------------------
     // --- GET ITEM INFO ---
     // ---------------------
@@ -746,7 +1007,8 @@
     $request = array('jsonrpc'=>'2.0',
                      'method'=>'item.get',
                      'params'=>array('itemids'=>$p_itemId,
-                     'output'=>'extend'),
+                         'webitems'=>'true',
+                         'output'=>'extend'),
                      'auth'=>$token,
                      'id'=>nextRequestID());
 
@@ -793,7 +1055,7 @@
 
     $mailData['HOST_ID'] = $thisHost['result'][0]['hostid'];
     $mailData['HOST_NAME'] = $thisHost['result'][0]['name'];
-    $mailData['HOST_ERROR'] = $thisHost['result'][0]['error'];
+    if (isset($thisHost['result'][0]['error'])) { $mailData['HOST_ERROR'] = $thisHost['result'][0]['error']; }
     $mailData['HOST_DESCRIPTION'] = $thisHost['result'][0]['description'];
 
     // --- Custom settings?
@@ -1038,6 +1300,7 @@
         _log('> Graphs found = '.sizeof($triggerGraphs));
     }
 
+    $hostGraphs = array();
 
     if ($hostScreen>0)
     {
@@ -1089,7 +1352,7 @@
         }
     }
 
-    // Strip off any excessive elements from the end
+    // Strip off any excessive elements from the end (protection of graph generation overload on system)
 
     while (sizeof($p_periods)>$maxGraphs) { array_pop($p_periods); }
     while (sizeof($p_periods_headers)>$maxGraphs) { array_pop($p_periods_headers); }
@@ -1105,7 +1368,7 @@
     {
         if ($forceGraph>0)
         {
-            $theGraph = $forceGraphInfo;
+            $theGraph = $forceGraphInfo['result'][0];
             $theType = 'Forced';
         }
         else
@@ -1141,6 +1404,7 @@
             $graphFiles[] = $graphFile;
 
             $mailData['GRAPHS_I'][$aKey]['PATH'] = $z_images_path . $graphFile;
+            $mailData['GRAPHS_I'][$aKey]['CID'] = 'images/'.$graphFile;
             $mailData['GRAPHS_I'][$aKey]['URL'] = $z_url_image . $graphFile;
             $mailData['GRAPHS_I'][$aKey]['HEADER'] = $p_periods_headers[$aKey];
         }
@@ -1171,6 +1435,7 @@
 
             $mailData['GRAPHS_'.$varName][$aKey]['URL'] = $z_url_image . $graphFile;
             $mailData['GRAPHS_'.$varName][$aKey]['PATH'] = $z_images_path . $graphFile;
+            $mailData['GRAPHS_'.$varName][$aKey]['CID'] = 'images/'.$graphFile;
         }
 
         $mailData['GRAPHS_'.$varName.'_LINK'] = $z_server.'screens.php?elementid='.$info[0]['screen']['screenid'];
@@ -1210,209 +1475,186 @@
     }
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Prepare LOG related content //////////////////////////////////////////////////////////////////////////
+    // Prepare HTML LOG content /////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     $mailData['LOG_HTML'] = implode('</br/>',$logging);
     $mailData['LOG_HTML'] = str_replace($cCRLF,'<br/>',$mailData['LOG_HTML']);
     $mailData['LOG_HTML'] = str_replace('<br/>','<br/>'.$cCRLF,$mailData['LOG_HTML']);
 
-    $mailData['LOG_HTML'] = '<html lang="en"><head><meta http-equiv=Content-Type content="text/html; charset=UTF-8">'.$cCRLF.
+    $mailData['LOG_HTML'] = '<html lang="en"><head><meta http-equiv=Content-Type content="text/html; charset=UTF-8"></head>'.$cCRLF.
+                            '<style type="text/css">'.$cCRLF.
+                            'body { font-family: courier, courier new, serif; font-size: 12px; }'.$cCRLF.
+                            '</style>'.$cCRLF.
                             '<body>'.$cCRLF.
                             $mailData['LOG_HTML'].$cCRLF.
                             '</body>'.$cCRLF.
                             '</html>';
 
+    // Prepare PLAIN LOG content
+
     $mailData['LOG_PLAIN'] = implode(chr(10),$logging);
 
-    /////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // Prepare others ///////////////////////////////////////////////////////////////////////////////////////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // Prepare others
 
-    $mailData['TRIGGER_URL'] = $z_server.'triggers.php?form=update&triggerid='.$mailData['TRIGGER_ID'];
-    $mailData['ITEM_URL'] = $z_server.'items.php?form=update&hostid='.$mailData['HOST_ID'].'&itemid='.$mailData['ITEM_ID'];
+    $mailData['TRIGGER_URL'] = $z_server.'triggers.php?form=update&triggerid='.$mailData['TRIGGER_ID'].'&context=host';
+    $mailData['ITEM_URL'] = $z_server.'items.php?form=update&hostid='.$mailData['HOST_ID'].'&itemid='.$mailData['ITEM_ID'].'&context=host';
     $mailData['HOST_URL'] = $z_server.'hosts.php?form=update&hostid='.$mailData['HOST_ID'];
+    $mailData['ACK_URL'] = $z_server.'zabbix.php?action=popup&popup_action=acknowledge.edit&eventids[]='.$mailData['EVENT_ID'];
     $mailData['EVENTDETAILS_URL'] = $z_server.'tr_events.php?triggerid='.$mailData['TRIGGER_ID'].'&eventid='.$mailData['EVENT_ID'];
-    $mailData['HOST_PROBLEMS_URL'] = $z_server.'zabbix.php?action=problem.view&filter_hostids%5B%5D='.$mailData['HOST_ID'].'&filter_set=1';
 
     $mailData['EVENT_DURATION'] = $p_duration;
+    $mailData['HOST_PROBLEMS_URL'] = $z_server.'zabbix.php?show=1&name=&inventory%5B0%5D%5Bfield%5D=type&inventory%5B0%5D%5Bvalue%5D=&evaltype=0&tags%5B0%5D%5Btag%5D=&tags%5B0%5D%5Boperator%5D=0&tags%5B0%5D%5Bvalue%5D=&show_tags=3&tag_name_format=0&tag_priority=&show_opdata=0&show_timeline=1&filter_name=&filter_show_counter=0&filter_custom_time=0&sort=clock&sortorder=DESC&age_state=0&show_suppressed=0&unacknowledged=0&compact_view=0&details=0&highlight_row=0&action=problem.view&hostids%5B%5D='.$mailData['HOST_ID'];
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Compose & Send Message ///////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    _log('# Setting up mailer');
+    _log('# Configuring Mailer');
 
-    // Do we need TLS or SSL?
+    $mail = new PHPMailer(true);
 
-    if (($p_smtp_transport=='tls') || ($p_smtp_transport=='ssl'))
+    try
     {
-        $transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port, $p_smtp_transport));
+        // If debugging is required change to '1'
+        $mail->SMTPDebug = 0;
 
+        // Initialize for international characters
+        $mail->CharSet = "UTF-8";
+        $mail->Encoding = "base64";
+
+	// Inialize SMTP parameters
+        $mail->isSMTP();
+        $mail->Host = $p_smtp_server;
+        $mail->Port = $p_smtp_port;
+
+        // --- Authentication required?
+        if ($p_smtp_username!="")
+        {
+            $mail->SMTPAuth = true;
+            $mail->Username = $p_smtp_username;
+            $mail->Password = $p_smtp_password;
+        }
+
+        // --- Disable strict certificate checking?
         if ($p_smtp_strict=='no')
         {
-            if ($transport instanceof \Swift_Transport_EsmtpTransport)
+            $mail->SMTPOptions = [
+                'ssl' => [ 'verify_peer' => false, 'verify_peer_name' => false, 'allow_self_signed' => true ]
+            ];
+        }
+
+        // --- Define from
+        $mail->Sender = $p_smtp_from_address;
+        $mail->SetFrom($p_smtp_from_address, $p_smtp_from_name, FALSE);
+
+        // --- Define reply-to
+        if ($p_smtp_reply_address!='')
+        {
+            $mail->clearReplyTos();
+            $mail->addReplyTo($p_smtp_reply_address, $p_smtp_reply_name);
+        }
+
+        // --- Add recipient
+        $mail->addAddress($p_recipient);
+
+        // --- Prepare embedding of the graphs by attaching and generating "cid" (content-id) information
+        function embedGraphs($graphs,$varName,$type)
+        {
+            global $mail;
+            global $mailData;
+
+            foreach($graphs as $aKey=>$anItem)
             {
-                $transport->setStreamOptions([
-                    'ssl' => ['allow_self_signed' => true,
-                              'verify_peer' => false,
-                              'verify_peer_name' => false]
-                    ]);
+                $mail->AddEmbeddedImage($mailData['GRAPHS_'.$varName][$aKey]['PATH'],
+                                        $mailData['GRAPHS_'.$varName][$aKey]['CID']);
+
+                // Add content-id marker to the identifier for ease of use in Twig
+                $mailData['GRAPHS_'.$varName][$aKey]['CID'] = 'cid:'.$mailData['GRAPHS_'.$varName][$aKey]['CID'];
+
+                _log('> Embedded graph image ('.$type.') '.$mailData['GRAPHS_'.$varName][$aKey]['URL']);
             }
         }
-        else
+
+        embedGraphs($graphFiles,'I','ITEM');
+        embedGraphs($triggerGraphs,'T','TRIGGER');
+        embedGraphs($hostGraphs,'H','HOST');
+
+        // --- Render the content with TWIG for HTML, Plain text and the Subject of the message
+        $loader = new \Twig\Loader\ArrayLoader([
+            'html' => file_get_contents($z_template_path.'html.template'),
+            'plain' => file_get_contents($z_template_path.'plain.template'),
+            'subject' => $mailData['SUBJECT'],
+        ]);
+
+        $twig = new \Twig\Environment($loader);
+
+        $bodyHTML = $twig->render('html', $mailData);
+        $bodyPlain = $twig->render('plain', $mailData);
+        $mailSubject = $twig->render('subject', $mailData);
+
+        // --- Attach debug log processing?
+        if (($cDebugMail) || (isset($problemData['debug'])))
         {
-            if ($transport instanceof \Swift_Transport_EsmtpTransport)
-            {
-                $transport->setStreamOptions([
-                    'ssl' => ['allow_self_signed' => false,
-                              'verify_peer' => true,
-                              'verify_peer_name' => true]
-                ]);
-            }
+            _log('# Attaching logs to mail message');
+
+            $mail->addStringAttachment($mailData['LOG_HTML'],'log.html');
+            $mail->addStringAttachment($mailData['LOG_PLAIN'],'log.txt');
         }
-    }
-    else
-    {
-        $transport = (new Swift_SmtpTransport($p_smtp_server, $p_smtp_port));
-    }
 
-    // Username/password?
+        // ---Fill body and subject and mark as HTML while also supplying plain text option alternative
+        // Note: Not using PHPMailer option for automatic text/plain generation (by design)
+        $mail->Body = $bodyHTML;
+        $mail->isHTML(true);
+        $mail->AltBody = $bodyPlain;
+        $mail->Subject = $mailSubject;
 
-    if ($p_smtp_username!='') { $transport->setUsername($p_smtp_username); }
-    if ($p_smtp_password!='') { $transport->setPassword($p_smtp_password); }
-
-    // Start actual mail(er)
-
-    $mailer = new Swift_Mailer($transport);
-
-    $message = (new Swift_Message());
-
-    // --- Fetch mailer ID from this message (no Swift function available for it ...)
-    // --- "Message-ID: <...id...@swift.generated>"
-
-    $content = $message->toString();
-    $lines = explode(chr(10),$content);
-    $firstLine = $lines[0];
-    $idParts = explode(' ',$firstLine);
-    $messageId = substr($idParts[1],1,-2);
-
-    _log('# Message ID = '.$messageId);
-
-    // Build parts for HTML and PLAIN
-
-    _log('# Processing templates');
-    _log('+ '.$z_template_path.'html.template');
-    _log('+ '.$z_template_path.'plain.template');
-
-    $loader = new \Twig\Loader\ArrayLoader([
-        'html' => file_get_contents($z_template_path.'html.template'),
-        'plain' => file_get_contents($z_template_path.'plain.template'),
-        'subject' => $mailData['SUBJECT'],
-    ]);
-
-    $twig = new \Twig\Environment($loader);
-
-    // --- Embed the images
-
-    function embedGraphs($graphs,$varName,$type)
-    {
-        global $message;
-        global $mailData;
-
-        foreach($graphs as $aKey=>$anItem)
+        // --- Send the message
+        if (!$mail->send())
         {
-            $mailData['GRAPHS_'.$varName][$aKey]['CID'] = $message->embed(Swift_Image::fromPath($mailData['GRAPHS_'.$varName][$aKey]['PATH']));
-            _log('> Embedded graph image ('.$type.') '.$mailData['GRAPHS_'.$varName][$aKey]['PATH']);
+            _log("! Failed to send mail message");
+            echo "! Failed to send mail message. Likely an issue with the recipient email address?".$cCRLF;
+            echo "+ Mailer error: ".$mail->ErrorInfo.$cCRLF;
         }
-    }
 
-    embedGraphs($graphFiles,'I','ITEM');
-    embedGraphs($triggerGraphs,'T','TRIGGER');
-    embedGraphs($hostGraphs,'H','HOST');
+        // --- Obtain message ID
+        $messageId = $mail->getlastMessageID();
+        _log('# Message ID = '.$messageId);
 
-    // --- Render the content
-
-    $bodyHTML = $twig->render('html', $mailData);
-    $bodyPlain = $twig->render('plain', $mailData);
-    $mailSubject = $twig->render('subject', $mailData);
-
-    // Prepare message
-
-    $message->setSubject($mailSubject)
-            ->setFrom($mailFrom)
-            ->setTo($p_recipient)
-            ->setBody($bodyHTML, 'text/html')
-            ->addPart($bodyPlain, 'text/plain');
-
-    if (($cDebugMail) || (isset($problemData['debug'])))
+        // --- Return Event TAG information for Zabbix to store with Zabbix event
+        $response = array('messageId'=>$messageId);
+        echo json_encode($response).$cCRLF;
+    } catch (phpmailerException $e)
     {
-        _log('# Attaching logs to mail message');
-
-        $attachLogHTML = new Swift_Attachment($mailData['LOG_HTML'], 'log.html', 'text/html');
-        $message->attach($attachLogHTML);
-
-        $attachLogPlain = new Swift_Attachment($mailData['LOG_PLAIN'], 'log.txt', '/text/plain');
-        $message->attach($attachLogPlain);
+       echo "! Failed to send message".$cCRLF;
+       echo "! phpMailer error message: ".$e->getMessage().$cCRLF;
+       _log("! phpMailer failed: ".$e->getMessage());
+    } catch (Exception $e)
+    {
+       echo "! Failed to send message".$cCRLF;
+       echo "! Error message: ".$e->getMessage().$cCRLF;
+       _log("! Failed: ".$e->getMessage());
     }
 
-    // Send message
-
-    $result = $mailer->send($message);
-
-    // Return Event TAG information for Zabbix
-
-    $response = array('messageId.mailGraph'=>$messageId);
-    echo json_encode($response).$cCRLF;
-
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
     // Wrap up //////////////////////////////////////////////////////////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    // Remove generated images? (default=yes)
-
-    function removeGraphs($graphs,$varName)
-    {
-        global $mailData;
-
-        foreach($graphs as $aKey=>$anItem)
-        {
-             unlink($mailData['GRAPHS_'.$varName][$aKey]['PATH']);
-             _log('> Removed generated image: '.$mailData['GRAPHS_'.$varName][$aKey]['PATH']);
-        }
-    }
-
-    if ($p_remove_images=='yes')
-    {
-        if (!$cDebug)
-        {
-            removeGraphs($graphFiles,'I');
-            removeGraphs($triggerGraphs,'T');
-            removeGraphs($hostGraphs,'H');
-        }
-        else
-        {
-            _log('> Not removing generated images (debug mode active)');
-        }
-    }
-    else
-    {
-        _log('> Not removing generated images');
-    }
-
     // Store log?
 
     if (($cDebug) || (isset($problemData['debug'])))
     {
+        // Prevent duplicate dump of log information
         unset($mailData['LOG_HTML']);
         unset($mailData['LOG_PLAIN']);
 
+        // Attach the collected information
         $content = implode(chr(10),$logging).$cCRLF.$cCRLF.'=== VALUES AVAILABLE FOR TWIG TEMPLATE ==='.$cCRLF.$cCRLF.json_encode($mailData,JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK);
         $content = str_replace(chr(13),'',$content);
 
+        // Save to unique log file
         $logName = 'log.'.$p_eventId.'.'.date('YmdHis').'.dump';
-
         file_put_contents($z_log_path.$logName,$content);
-    	_log('= Log stored to '.$z_log_path.$logName);
+        _log('= Log stored to '.$z_log_path.$logName);
     }
 ?>

mailGraph.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>5.0</version>
-    <date>2021-03-17T12:55:43Z</date>
+    <version>5.4</version>
+    <date>2023-08-16T20:38:38Z</date>
     <media_types>
         <media_type>
             <name>MailGraph</name>
@@ -9,7 +9,7 @@
             <parameters>
                 <parameter>
                     <name>baseURL</name>
-                    <value>https://mydomain.com/zabbix/</value>
+                    <value>https://myzabbix.com/zabbix/</value>
                 </parameter>
                 <parameter>
                     <name>duration</name>
@@ -35,10 +35,6 @@
                     <name>infoTest</name>
                     <value>Test</value>
                 </parameter>
-                <parameter>
-                    <name>itemId</name>
-                    <value>{ITEM.ID}</value>
-                </parameter>
                 <parameter>
                     <name>periods</name>
                     <value>10m,4h,1d,7d</value>
@@ -61,128 +57,157 @@
                 </parameter>
                 <parameter>
                     <name>URL</name>
-                    <value>https://mydomain.com/mailGraph.php</value>
+                    <value>https://myzabbix.com/mailGraph.php</value>
                 </parameter>
             </parameters>
-            <script>try {&#13;
-    // Pickup parameters&#13;
-    params = JSON.parse(value),&#13;
-        req = new CurlHttpRequest(),&#13;
-        fields = {},&#13;
-        resp = '',&#13;
-        result = { tags: {} };&#13;
-&#13;
-    // Set HTTP proxy if required&#13;
-    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {&#13;
-        req.setProxy(params.HTTPProxy);&#13;
-        fields.HTTPProxy = params.HTTPProxy;&#13;
-    }&#13;
-&#13;
-    // Declare output type&#13;
-    req.AddHeader('Content-Type: application/json');&#13;
-&#13;
-    // Must have fields&#13;
-    fields.itemId = params.itemId;&#13;
-    fields.eventId = params.eventId;&#13;
-    fields.recipient = params.recipient;&#13;
-    fields.baseURL = params.baseURL;&#13;
-    fields.duration = params.duration;&#13;
-&#13;
-    // Optional fields&#13;
-    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }&#13;
-    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }&#13;
-    if (typeof params.subject === 'string') { fields.subject = params.subject; }&#13;
-    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }&#13;
-    if (typeof params.periods === 'string') { fields.periods = params.periods; }&#13;
-    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }&#13;
-    if (typeof params.debug === 'string') { fields.debug = params.debug; }&#13;
-&#13;
-    // Add generic fields&#13;
-    Object.keys(params).forEach(function(key) {&#13;
-        if (key.substring(0, 4) == 'info') {&#13;
-            fields[key] = params[key];&#13;
-        }&#13;
-    });&#13;
-&#13;
-    // Post information to the processing script&#13;
-    Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));&#13;
-    var resp = req.Post(params.URL,JSON.stringify(fields));&#13;
-    Zabbix.Log(4, '[Mailgraph Webhook] Receiving response:' + resp);&#13;
-&#13;
-    // If there was an error, report it&#13;
-    if (req.Status() != 200) { throw JSON.parse(resp).errors[0]; }&#13;
-&#13;
-    // We expect the message id back from the processing script&#13;
-    resp = JSON.parse(resp);&#13;
-    result.tags.__message_id = resp.messageId;&#13;
-&#13;
-    // Pass the result back to Zabbix&#13;
-    return JSON.stringify(result);&#13;
-}&#13;
-catch (error)&#13;
-{&#13;
-    // In case something went wrong in the processing, pass the error back to Zabbix&#13;
-    Zabbix.Log(127, 'MailGraph notification failed : '+error);&#13;
-    throw 'MailGraph notification failed : '+error;&#13;
+            <script>// mailGraph v2.16
+
+// Function to test string
+function isJSON(str) {
+	try {
+		JSON.stringify(JSON.parse(str));
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
+
+try {
+    // Pickup parameters
+    params = JSON.parse(value),
+        req = new HttpRequest(),
+        fields = {},
+        resp = '',
+        result = { tags: {} };
+
+    // Set HTTP proxy if required
+    if (typeof params.HTTPProxy === 'string' &amp;&amp; params.HTTPProxy.trim() !== '') {
+        req.setProxy(params.HTTPProxy);
+        fields.HTTPProxy = params.HTTPProxy;
+    }
+
+    // Declare output type
+    req.addHeader('Content-Type: application/json');
+
+    // Pick up fields relevant for mailGraph API level call while parsing/casting fields that should be integer
+    fields.itemId = params.itemId * 1;
+    fields.eventId = params.eventId * 1;
+    fields.recipient = params.recipient;
+    fields.baseURL = params.baseURL;
+    fields.duration = params.duration * 1;
+
+    if (fields.recipient.charAt(0) == '{') {
+      throw '[MailGraph Webhook] Please define recipient for the test message!';
+    }
+
+    // Optional fields
+    if (typeof params.graphWidth === 'string') { fields.graphWidth = params.graphWidth; }
+    if (typeof params.graphHeight === 'string') { fields.graphHeight = params.graphHeight; }
+    if (typeof params.subject === 'string') { fields.subject = params.subject; }
+    if (typeof params.showLegend === 'string') { fields.showLegend = params.showLegend; }
+    if (typeof params.periods === 'string') { fields.periods = params.periods; }
+    if (typeof params.periods_headers === 'string') { fields.periods_headers = params.periods_headers; }
+    if (typeof params.debug === 'string') { fields.debug = params.debug; }
+
+    // Add generic fields
+    Object.keys(params).forEach(function(key) {
+        if (key.substring(0, 4) == 'info') {
+            fields[key] = params[key];
+        }
+    });
+
+    // Post information to the processing script
+    Zabbix.Log(4, '[MailGraph Webhook] Sending request: ' + params.URL + '?' + JSON.stringify(fields));
+    var resp = req.post(params.URL,JSON.stringify(fields));
+    Zabbix.Log(4, '[Mailgraph Webhook] Received response:' + resp);
+
+    // The response can be
+    // - did not receive status 200 as result (contains HTTP server response)
+    // - null (no response received at all)
+    // - empty string (likely no e-mail sent due to recipient issue)
+    // - not json (debugging message for troubleshooting or configuration hints)
+    // - json (contains the mail message ID sent)
+
+    if (req.getStatus() != 200) {
+       throw '[MailGraph Webhook] Processing of mailGraph.php failed: ' + resp;
+    }
+    if (resp==null) {
+      throw '[MailGraph Webhook] No response received from mailGraph.php? This should not occur (check URL and your webserver!)';
+    }
+
+    if (resp=='') {
+      throw '[MailGraph Webhook] No data received from mailGraph - please check recipient address or mailGraph log and retry.';
+    }
+
+    // Check if JSON was returned
+    if (!isJSON(resp)) {
+      throw '[MailGraph Webhook] An error has occurred during processing: ' + resp;
+    }
+
+    // We expect the message id back from the processing script response in JSON format
+    msg = JSON.parse(resp);
+
+    result.tags.__message_id = msg.messageId;
+    Zabbix.Log(4, '[MailGraph Webhook] Message sent with identification &quot;' + msg.messageId + '&quot;');
+
+    // Pass the result back to Zabbix
+    return JSON.stringify(result);
+}
+catch (error)
+{
+    // In case something else went wrong in the processing, pass the error back to Zabbix
+    Zabbix.Log(127, 'MailGraph notification failed: '+error);
+    throw 'MailGraph notification failed : '+error;
 }</script>
             <process_tags>YES</process_tags>
-            <description>The &quot;URL&quot; must point to the location of the processing script. If a proxy is required, define &quot;HTTPProxy&quot; for the proxy address.&#13;
-&#13;
-Customization:&#13;
-- &quot;graphWidth&quot; and &quot;graphWidth&quot; can be defined for the image size&#13;
-- &quot;showLegend&quot; can be defined to show or hide the legend of the graph&#13;
-- &quot;subject&quot; can be defined for a customized subject for the mail message&#13;
-- &quot;periods&quot; and &quot;periods_headers&quot; can be defined for displaying multiple periods of the same graph, or&#13;
-- &quot;period&quot; and &quot;period_header&quot; can be defined to display a single graph&#13;
-&#13;
-The html.template and plain.template files can be adjusted (TWIG format).&#13;
-&#13;
+            <description>The &quot;URL&quot; must point to the location of the processing script. If a proxy is required, define &quot;HTTPProxy&quot; for the proxy address.
+
+Customization:
+- &quot;graphWidth&quot; and &quot;graphWidth&quot; can be defined for the image size
+- &quot;showLegend&quot; can be defined to show or hide the legend of the graph
+- &quot;subject&quot; can be defined for a customized subject for the mail message
+- &quot;periods&quot; and &quot;periods_headers&quot; can be defined for displaying multiple periods of the same graph, or
+- &quot;period&quot; and &quot;period_header&quot; can be defined to display a single graph
+
+The html.template and plain.template files can be adjusted (TWIG format).
+
 More details are available at https://github.com/moudsen/mailGraph</description>
             <message_templates>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>PROBLEM</operation_mode>
                     <subject>Problem: {EVENT.NAME}</subject>
-                    <message>Problem started at {EVENT.TIME} on {EVENT.DATE}&#13;
-Problem name: {EVENT.NAME}&#13;
-Host: {HOST.NAME}&#13;
-Severity: {EVENT.SEVERITY}&#13;
-Operational data: {EVENT.OPDATA}&#13;
-Original problem ID: {EVENT.ID}&#13;
-{TRIGGER.URL}&#13;
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
+                    <message>Problem started at {EVENT.TIME} on {EVENT.DATE}
+Problem name: {EVENT.NAME}
+Host: {HOST.NAME}
+Severity: {EVENT.SEVERITY}
+Operational data: {EVENT.OPDATA}
+Original problem ID: {EVENT.ID}
+Trigger ID (/url): {TRIGGER.ID} {TRIGGER.URL}</message>
                 </message_template>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>RECOVERY</operation_mode>
-                    <subject>Resolved in {EVENT.DURATION}: {EVENT.NAME}</subject>
-                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}&#13;
-Problem name: {EVENT.NAME}&#13;
-Problem duration: {EVENT.DURATION}&#13;
-Host: {HOST.NAME}&#13;
-Severity: {EVENT.SEVERITY}&#13;
-Original problem ID: {EVENT.ID}&#13;
-{TRIGGER.URL}&#13;
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
+                    <subject>Resolved in {EVENT.DURATION}: {EVENT.RECOVERY.NAME}</subject>
+                    <message>Problem has been resolved at {EVENT.RECOVERY.TIME} on {EVENT.RECOVERY.DATE}
+Problem name: {EVENT.RECOVERY.NAME}
+Problem duration: {EVENT.DURATION}
+Host: {HOST.NAME}
+Severity: {EVENT.SEVERITY}
+Original problem ID: {EVENT.ID}
+Trigger ID: {TRIGGER.ID} {TRIGGER.URL}</message>
                 </message_template>
                 <message_template>
                     <event_source>TRIGGERS</event_source>
                     <operation_mode>UPDATE</operation_mode>
                     <subject>Updated problem in {EVENT.AGE}: {EVENT.NAME}</subject>
-                    <message>{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.&#13;
-{EVENT.UPDATE.MESSAGE}&#13;
-&#13;
-Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.&#13;
-&#13;
-eventId: {EVENT.ID}&#13;
-TriggerId: {TRIGGER.ID}&#13;
-itemId: {ITEM.ID]</message>
+                    <message>{USER.FULLNAME} {EVENT.UPDATE.ACTION} problem at {EVENT.UPDATE.DATE} {EVENT.UPDATE.TIME}.
+{EVENT.UPDATE.MESSAGE}
+
+Current problem status is {EVENT.STATUS}, age is {EVENT.AGE}, acknowledged: {EVENT.ACK.STATUS}.
+
+Event ID: {EVENT.ID}
+Trigger ID: {TRIGGER.ID}</message>
                 </message_template>
             </message_templates>
         </media_type>

templates/html.template

@@ -81,6 +81,9 @@
     .content {
         font-size: 14px;
     }
+    .acknowledge {
+        font-size: 10px;
+    }
 </style>
 </head>
 <body>
@@ -112,6 +115,18 @@
                         </td>
                     </tr>
                 </table>
+{% if ACKNOWLEDGES|length > 0 %}
+                <br/>
+{% for anAck in ACKNOWLEDGES %}
+                <table style="border:0; text-align:left;" cellpadding="5" cellspacing="0">
+                    <tr>
+                        <td class="acknowledge">
+                            <b>{{ anAck._clock }}</b><br/><em>({{ anAck.username }}, {{ anAck.name }} {{ anAck.surname }})</em><br/>[{{ anAck._actions }}]<br/>{{ anAck.message }}
+                        </td>
+                    </tr>
+                </table>
+{% endfor %}
+{% endif %}
             </td>
         </tr>
         <tr>
@@ -120,10 +135,12 @@
                     Event ID: <a href="{{ EVENTDETAILS_URL }}">{{ EVENT_ID }}</a> //
                     Trigger ID: <a href="{{ TRIGGER_URL }}">{{ TRIGGER_ID }}</a> //
                     Item ID: <a href="{{ ITEM_URL }}">{{ ITEM_ID }}</a> //
-                    Host ID: <a href="{{ HOST_URL }}">{{ HOST_ID }}</a>
+                    Host ID: <a href="{{ HOST_URL }}">{{ HOST_ID }}</a> //
+                    <a href="{{ HOST_PROBLEMS_URL }}">Problems</a>
 {% if GRAPH_ZABBIXLINK|length > 0 %}
                     // Graph ID: <a href="{{ GRAPH_ZABBIXLINK }}">{{ GRAPH_ID }}</a>
 {% endif %}
+                   // <a href="{{ ACK_URL }}">Ack</a>
                 </div>
             </td>
         </tr>
@@ -189,4 +206,4 @@
 {% endif %}
     </table>
 </body>
-</html>
+</html>